diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 7544210..4a422e7 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -3,7 +3,6 @@
     dev-lang/fsharp[~scm]
     dev-lang/fstar[~scm]
     dev-python/pytype[~scm]
-    dev-util/universal-ctags[~scm]
     games-emulation/gambatte[~scm]
     games-engines/OpenJK[~scm]
     games-engines/flare[~scm]
diff --git a/packages/app-arch/innoextract/innoextract-1.7.exheres-0 b/packages/app-arch/innoextract/innoextract-1.9.exheres-0
similarity index 100%
rename from packages/app-arch/innoextract/innoextract-1.7.exheres-0
rename to packages/app-arch/innoextract/innoextract-1.9.exheres-0
diff --git a/packages/dev-python/python-sipsimple/files/d75b225e566cae2c998504dc5cd76bb30226cb43.patch b/packages/dev-python/python-sipsimple/files/d75b225e566cae2c998504dc5cd76bb30226cb43.patch
deleted file mode 100644
index d86f3ad..0000000
--- a/packages/dev-python/python-sipsimple/files/d75b225e566cae2c998504dc5cd76bb30226cb43.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream: Yes
-Source: https://github.com/AGProjects/python3-sipsimple/commit/d75b225e566cae2c998504dc5cd76bb30226cb43
-
-From d75b225e566cae2c998504dc5cd76bb30226cb43 Mon Sep 17 00:00:00 2001
-From: Adrian Georgescu <ag@ag-projects.com>
-Date: Tue, 16 Mar 2021 13:54:03 +0000
-Subject: [PATCH] Decode uri.transport if is bytes in DNS Lookup
-
----
- sipsimple/lookup.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/sipsimple/lookup.py b/sipsimple/lookup.py
-index 8ce86a92..27672da7 100644
---- a/sipsimple/lookup.py
-+++ b/sipsimple/lookup.py
-@@ -255,8 +255,9 @@ def lookup_sip_proxy(self, uri, supported_transports, timeout=3.0, lifetime=15.0
- 
-         try:
-             # If the host part of the URI is an IP address, we will not do any lookup
-+            transport = uri.transport.decode() if isinstance(uri.transport, bytes) else uri.transport
-             if re.match("^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$", uri.host.decode()):
--                transport = 'tls' if uri.secure else uri.transport.lower()
-+                transport = 'tls' if uri.secure else transport.lower()
-                 if transport not in supported_transports:
-                     raise DNSLookupError("IP transport %s dictated by URI is not supported" % transport)
-                 port = uri.port or (5061 if transport=='tls' else 5060)
-@@ -270,7 +271,7 @@ def lookup_sip_proxy(self, uri, supported_transports, timeout=3.0, lifetime=15.0
- 
-             # If the port is specified in the URI, we will only do an A lookup
-             if uri.port:
--                transport = 'tls' if uri.secure else uri.transport.lower()
-+                transport = 'tls' if uri.secure else transport.lower()
-                 if transport not in supported_transports:
-                     raise DNSLookupError("Host transport %s dictated by URI is not supported" % transport)
-                 addresses = self._lookup_a_records(resolver, [uri.host.decode()], log_context=log_context)
diff --git a/packages/dev-python/python-sipsimple/files/python-sipsimple-gcc10-fix.patch b/packages/dev-python/python-sipsimple/files/python-sipsimple-gcc10-fix.patch
deleted file mode 100644
index 3d70a8f..0000000
--- a/packages/dev-python/python-sipsimple/files/python-sipsimple-gcc10-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream: Submitted
-Source: https://github.com/AGProjects/python-sipsimple/pull/10
-
-From 052f7301a0c906c4117dff5453222f12e768bb49 Mon Sep 17 00:00:00 2001
-From: Tom Briden <tom@decompile.me.uk>
-Date: Thu, 23 Jul 2020 19:22:30 +0100
-Subject: [PATCH] Fix multiple definition of `PJ_ATTR_MAY_ALIAS' with GCC-10
-
----
- deps/pjsip/pjlib/include/pj/list.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/pjsip/pjlib/include/pj/list.h b/deps/pjsip/pjlib/include/pj/list.h
-index 880f58d4..50510fe3 100644
---- a/deps/pjsip/pjlib/include/pj/list.h
-+++ b/deps/pjsip/pjlib/include/pj/list.h
-@@ -71,7 +71,7 @@ PJ_BEGIN_DECL
-  * must initialize the 'value' member to an appropriate value (typically the
-  * owner itself).
-  */
--struct pj_list
-+extern struct pj_list
- {
-     PJ_DECL_LIST_MEMBER(void);
- } PJ_ATTR_MAY_ALIAS; /* may_alias avoids warning with gcc-4.4 -Wall -O2 */
diff --git a/packages/dev-python/python-sipsimple/python-sipsimple-4.0.1.exheres-0 b/packages/dev-python/python-sipsimple/python-sipsimple-5.2.6.exheres-0
similarity index 52%
rename from packages/dev-python/python-sipsimple/python-sipsimple-4.0.1.exheres-0
rename to packages/dev-python/python-sipsimple/python-sipsimple-5.2.6.exheres-0
index ebddf7f..b5a29e6 100644
--- a/packages/dev-python/python-sipsimple/python-sipsimple-4.0.1.exheres-0
+++ b/packages/dev-python/python-sipsimple/python-sipsimple-5.2.6.exheres-0
@@ -7,6 +7,13 @@ require setup-py [ import=distutils blacklist="2" multibuild=false ]
 SUMMARY="SIP SIMPLE client SDK is a Software Development Kit"
 HOMEPAGE="http://sipsimpleclient.org ${HOMEPAGE}"
 
+ZRTPCPP_SHA="6b3cd8e6783642292bad0c21e3e5e5ce45ff3e03"
+
+DOWNLOADS+="
+    https://github.com/pjsip/pjproject/archive/2.10.tar.gz
+    https://github.com/wernerd/ZRTPCPP/archive/${ZRTPCPP_SHA}.tar.gz -> ZRTPCPP-${ZRTPCPP_SHA}.tar.gz
+"
+
 LICENCES="GPL-3"
 SLOT="0"
 PLATFORMS="~amd64 ~x86"
@@ -31,6 +38,7 @@ DEPENDENCIES="
         providers:openssl? ( dev-libs/openssl )
     run:
         dev-python/dnspython[python_abis:*(-)?]
+        dev-python/gevent[python_abis:*(-)?]
         dev-python/greenlet[python_abis:*(-)?]
         dev-python/lxml[python_abis:*(-)?]
         dev-python/python-dateutil[python_abis:*(-)?]
@@ -46,10 +54,41 @@ DEPENDENCIES="
 
 DEFAULT_SRC_PREPARE_PATCHES=(
     "${FILES}"/${PN}-fix-build.patch
-    "${FILES}"/${PN}-gcc10-fix.patch
-    "${FILES}"/d75b225e566cae2c998504dc5cd76bb30226cb43.patch
 )
 
+src_prepare() {
+    setup-py_src_prepare
+
+    # MOst of this is straight from get_dependencies.sh but that
+    # wants to download the dependencies directly so we can't use it
+    edo mkdir "${WORK}"/deps/pjsip
+    edo mv "${WORKBASE}"/pjproject*/* "${WORK}"/deps/pjsip/
+
+    edo pushd "${WORK}"/deps/
+
+    # Copy wrapper from old version to third_party/zsrtp/
+    edo mkdir ./pjsip/third_party/zsrtp
+    cp -r zsrtp/include ./pjsip/third_party/zsrtp/
+    cp -r zsrtp/srtp    ./pjsip/third_party/zsrtp/
+    cp -r zsrtp/build   ./pjsip/third_party/build/zsrtp
+
+    # Copy new version to third_party/zsrtp/
+    mkdir ./pjsip/third_party/zsrtp/zrtp
+    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/bnlib ./pjsip/third_party/zsrtp/zrtp/
+    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/common ./pjsip/third_party/zsrtp/zrtp/
+    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/cryptcommon ./pjsip/third_party/zsrtp/zrtp/
+    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/srtp ./pjsip/third_party/zsrtp/zrtp/
+    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/zrtp ./pjsip/third_party/zsrtp/zrtp/
+    cp "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/COPYING ./pjsip/third_party/zsrtp/zrtp/
+    cp "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/README.md ./pjsip/third_party/zsrtp/zrtp/
+
+    for p in patches/*.patch; do
+        expatch -p0 "${p}"
+    done
+
+    edo popd
+}
+
 src_compile() {
     # breaks horribly with 'ld'
     export LD=${CC}
diff --git a/packages/dev-python/python-xcaplib/files/python-xcaplib-work-with-eventlib.patch b/packages/dev-python/python-xcaplib/files/python-xcaplib-work-with-eventlib.patch
deleted file mode 100644
index 72abf1c..0000000
--- a/packages/dev-python/python-xcaplib/files/python-xcaplib-work-with-eventlib.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Upstream: Yes
-Source: https://github.com/AGProjects/python3-xcaplib/commit/066759cf355b152375767bee4c3858dc0b8087e4
-
-From 066759cf355b152375767bee4c3858dc0b8087e4 Mon Sep 17 00:00:00 2001
-From: Worawut Boonpeang <worawut@ag-projects.com>
-Date: Fri, 4 Dec 2020 13:49:54 +0000
-Subject: [PATCH] xcaplib (Python3) work with eventlib
-
----
- xcaplib/green.py      |  4 +++-
- xcaplib/xcapclient.py | 10 ++++++++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/xcaplib/green.py b/xcaplib/green.py
-index 237d9d8..d01ee11 100644
---- a/xcaplib/green.py
-+++ b/xcaplib/green.py
-@@ -2,6 +2,8 @@
- from eventlib.green import socket, ssl, httplib, urllib2
- from xcaplib import httpclient
- from xcaplib import client
-+import urllib
-+import http
- 
- 
- class HTTPConnection(httplib.HTTPConnection):
-@@ -22,7 +24,7 @@ def http_open(self, req):
- 
- class HTTPSHandler(urllib.request.HTTPSHandler):
-     def https_open(self, req):
--        return self.do_open(HTTPSConnection, req)
-+        return self.do_open(http.client.HTTPSConnection, req)
- 
- 
- class HTTPClient(httpclient.HTTPClient):
-diff --git a/xcaplib/xcapclient.py b/xcaplib/xcapclient.py
-index cd409df..384c237 100755
---- a/xcaplib/xcapclient.py
-+++ b/xcaplib/xcapclient.py
-@@ -129,6 +129,8 @@ def setup_parser_request(parser):
-     parser.add_option('--etag', help="perform a conditional operation", metavar='ETAG')
-     parser.add_option('--add-header', dest='headers',
-                       action='append', default=[], help=optparse.SUPPRESS_HELP)
-+    parser.add_option("--eventlib", dest='eventlib_enable',
-+                      help="Enables non-blocking mode using eventlib library")
-     parser.add_option("-i", dest='input_filename',
-                       help="source file for the PUT request; default is <stdin>")
-     parser.add_option("-o", dest='output_filename',
-@@ -366,7 +368,11 @@ def update_options_from_config(options):
-                 setattr(options, key, value)
- 
- def parse_args():
--    argv = sys.argv[1:]
-+    argv = None
-+    if "--eventlib" in sys.argv[1:]:
-+        argv = sys.argv[2:]
-+    else:
-+        argv = sys.argv[1:]
- 
-     if not argv:
-         sys.exit('Type %s -h for help.' % sys.argv[0])
-@@ -496,7 +502,7 @@ def get_exit_code(http_error):
-         return 3
- 
- def main():
--    if sys.argv[0].endswith('-eventlib'):
-+    if "--eventlib" in sys.argv[1:]:
-         from xcaplib.green import XCAPClient as client_class
-     else:
-         client_class = XCAPClient
diff --git a/packages/dev-python/python-xcaplib/python-xcaplib-2.0.0.exheres-0 b/packages/dev-python/python-xcaplib/python-xcaplib-2.0.1.exheres-0
similarity index 87%
rename from packages/dev-python/python-xcaplib/python-xcaplib-2.0.0.exheres-0
rename to packages/dev-python/python-xcaplib/python-xcaplib-2.0.1.exheres-0
index dd03f75..b46f43f 100644
--- a/packages/dev-python/python-xcaplib/python-xcaplib-2.0.0.exheres-0
+++ b/packages/dev-python/python-xcaplib/python-xcaplib-2.0.1.exheres-0
@@ -14,11 +14,8 @@ MYOPTIONS=""
 
 DEPENDENCIES="
     run:
+        dev-python/gevent[python_abis:*(-)?]
         dev-python/lxml[python_abis:*(-)?]
         dev-python/python-application[>=3.0.3][python_abis:*(-)?]
 "
 
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/${PN}-work-with-eventlib.patch
-)
-
diff --git a/packages/dev-util/bakefile/bakefile-0.2.11.exheres-0 b/packages/dev-util/bakefile/bakefile-0.2.11.exheres-0
index f2c4e79..ac02099 100644
--- a/packages/dev-util/bakefile/bakefile-0.2.11.exheres-0
+++ b/packages/dev-util/bakefile/bakefile-0.2.11.exheres-0
@@ -5,7 +5,7 @@ require python [ blacklist=3 has_bin=true has_lib=true multibuild=false ]
 require github [ user="vslavik" release="v${PV}" suffix=tar.gz ]
 
 SUMMARY="Bakefile makefiles generator"
-HOMEPAGE="http://bakefile.org/"
+HOMEPAGE="https://bakefile.org/"
 
 LICENCES="MIT"
 SLOT="0"
diff --git a/packages/dev-util/cflow/cflow-1.5.exheres-0 b/packages/dev-util/cflow/cflow-1.6.exheres-0
similarity index 100%
rename from packages/dev-util/cflow/cflow-1.5.exheres-0
rename to packages/dev-util/cflow/cflow-1.6.exheres-0
diff --git a/packages/dev-util/github-cli/github-cli-1.14.0.exheres-0 b/packages/dev-util/github-cli/github-cli-2.1.0.exheres-0
similarity index 83%
rename from packages/dev-util/github-cli/github-cli-1.14.0.exheres-0
rename to packages/dev-util/github-cli/github-cli-2.1.0.exheres-0
index afc361b..33c5b02 100644
--- a/packages/dev-util/github-cli/github-cli-1.14.0.exheres-0
+++ b/packages/dev-util/github-cli/github-cli-2.1.0.exheres-0
@@ -30,8 +30,8 @@ src_compile() {
     emake
     emake manpages
 
-	edo go run ./cmd/gh completion -s bash > gh.bash-completion
-	edo go run ./cmd/gh completion -s zsh > _gh
+    edo go run ./cmd/gh completion -s bash > gh.bash-completion
+    edo go run ./cmd/gh completion -s zsh > _gh
     esandbox enable_net
 }
 
@@ -40,7 +40,7 @@ src_install() {
     emagicdocs
 
     doman share/man/man?/gh*.?
-    dobashcompletion gh.bash-completion
+    dobashcompletion gh.bash-completion gh
     dozshcompletion _gh
 }
 
diff --git a/packages/dev-util/universal-ctags/universal-ctags-scm.exheres-0 b/packages/dev-util/universal-ctags/universal-ctags-scm.exheres-0
deleted file mode 100644
index 53ef242..0000000
--- a/packages/dev-util/universal-ctags/universal-ctags-scm.exheres-0
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require alternatives github [ user='universal-ctags' pn='ctags' ]
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
-
-SUMMARY="Universal ctags"
-
-LICENCES="GPL-2"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    json [[ description = [ Add support for JSON format as output ] ]]
-    seccomp [[ description = [ Add support for libseccomp library ] ]]
-    xml
-    yaml [[ description = [ Add support for YAML format as output ] ]]
-"
-
-DEPENDENCIES="
-    build+run:
-        json? ( dev-libs/jansson )
-        seccomp? ( sys-libs/libseccomp )
-        xml? ( dev-libs/libxml2:2.0[>=2.7.7] )
-        yaml? ( dev-libs/libyaml )
-    build:
-        dev-python/docutils
-        virtual/pkg-config
-"
-
-# input-encoding-option and output-encoding-option fail as of 20-03-2020
-RESTRICT="test"
-
-DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
-    'json'
-    'seccomp'
-    'xml'
-    'yaml'
-)
-
-src_install() {
-    default
-
-    # alternatives collision
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{ctags,universal-ctags}
-    edo mv "${IMAGE}"/usr/share/man/man1/{ctags,universal-ctags}.1
-
-    alternatives_for ctags universal-ctags 500 \
-        /usr/$(exhost --target)/bin/ctags universal-ctags \
-        /usr/share/man/man1/ctags.1 universal-ctags.1
-}
-
diff --git a/packages/net-im/discord-bin/discord-bin-0.0.15.exheres-0 b/packages/net-im/discord-bin/discord-bin-0.0.16.exheres-0
similarity index 100%
rename from packages/net-im/discord-bin/discord-bin-0.0.15.exheres-0
rename to packages/net-im/discord-bin/discord-bin-0.0.16.exheres-0
diff --git a/packages/net-im/slack/slack-4.16.2.exheres-0 b/packages/net-im/slack/slack-4.20.0.exheres-0
similarity index 100%
rename from packages/net-im/slack/slack-4.16.2.exheres-0
rename to packages/net-im/slack/slack-4.20.0.exheres-0
diff --git a/packages/voip/blink/blink-4.0.0.exheres-0 b/packages/voip/blink/blink-5.1.1.exheres-0
similarity index 95%
rename from packages/voip/blink/blink-4.0.0.exheres-0
rename to packages/voip/blink/blink-5.1.1.exheres-0
index dbaf94b..4b2f398 100644
--- a/packages/voip/blink/blink-4.0.0.exheres-0
+++ b/packages/voip/blink/blink-5.1.1.exheres-0
@@ -25,7 +25,7 @@ DEPENDENCIES="
         dev-python/python-application[>=3.0.3][python_abis:*(-)?]
         dev-python/python-dateutil[python_abis:*(-)?]
         dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
-        dev-python/python-sipsimple[>=4.0.1][python_abis:*(-)?]
+        dev-python/python-sipsimple[>=5.2.2][python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
         net-twisted/Twisted[python_abis:*(-)?]
 "
diff --git a/packages/x11-apps/picom/picom-7.5.exheres-0 b/packages/x11-apps/picom/picom-8.2.exheres-0
similarity index 94%
rename from packages/x11-apps/picom/picom-7.5.exheres-0
rename to packages/x11-apps/picom/picom-8.2.exheres-0
index 2051c5d..393a263 100644
--- a/packages/x11-apps/picom/picom-7.5.exheres-0
+++ b/packages/x11-apps/picom/picom-8.2.exheres-0
@@ -23,9 +23,9 @@ DEPENDENCIES="
         x11-proto/xorgproto
     build+run:
         dev-libs/libev
-        dev-libs/pcre[>=8.10]
+        dev-libs/pcre[>=8.20]
         x11-libs/libX11
-        x11-libs/libxcb[>=1.9.2]
+        x11-libs/libxcb[>=1.12.0]
         x11-libs/libXext
         x11-libs/pixman:1
         x11-utils/xcb-util-image
@@ -51,7 +51,7 @@ DEFAULT_SRC_INSTALL_EXTRA_DOCS=(
 
 MESON_SRC_CONFIGURE_PARAMS=(
     "-Dunittest=true"
-    "-Dbuild_docs=true"  # with_docs in "next" branch
+    "-Dwith_docs=true"
 )
 MESON_SRC_CONFIGURE_OPTION_SWITCHES=(
     "dbus"