diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml
index 188f7d534d..48527c88ae 100644
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -28,4 +28,4 @@ jobs:
         sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile
     - name: Test with pkgcheck
       run: |
-        pkgcheck scan --exit --checks=-RedundantVersionCheck,-VisibilityCheck,-AcctCheck
+        pkgcheck scan --exit --checks=-RedundantVersionCheck --keywords=-MissingAccountIdentifier
diff --git a/app-misc/ufetch/ufetch-0.1.ebuild b/app-misc/ufetch/ufetch-0.1.ebuild
index 93a83ef0a7..712b151bec 100644
--- a/app-misc/ufetch/ufetch-0.1.ebuild
+++ b/app-misc/ufetch/ufetch-0.1.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://gitlab.com/jschx/${PN}"
 case "${PV}" in
 	"9999")
 		inherit git-r3
+		EGIT_REPO_URI="https://gitlab.com/jschx/ufetch.git"
 		;;
 	*)
 		P0="${PN}-v${PV}"
-		SRC_URI="${EGIT_REPO_URI}/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://gitlab.com/jschx/ufetch/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${P0}"
+		KEYWORDS="~amd64 ~x86"
 esac
 
 DESCRIPTION="Tiny system info for Unix-like operating systems"
-HOMEPAGE="${EGIT_REPO_URI}"
+HOMEPAGE="https://gitlab.com/jschx/ufetch"
 LICENSE="ISC"
 
+RESTRICT="mirror test"
+
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 src_install() {
 	exeinto /usr/bin &&
diff --git a/app-misc/ufetch/ufetch-0.2.ebuild b/app-misc/ufetch/ufetch-0.2.ebuild
index 93a83ef0a7..712b151bec 100644
--- a/app-misc/ufetch/ufetch-0.2.ebuild
+++ b/app-misc/ufetch/ufetch-0.2.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://gitlab.com/jschx/${PN}"
 case "${PV}" in
 	"9999")
 		inherit git-r3
+		EGIT_REPO_URI="https://gitlab.com/jschx/ufetch.git"
 		;;
 	*)
 		P0="${PN}-v${PV}"
-		SRC_URI="${EGIT_REPO_URI}/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://gitlab.com/jschx/ufetch/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${P0}"
+		KEYWORDS="~amd64 ~x86"
 esac
 
 DESCRIPTION="Tiny system info for Unix-like operating systems"
-HOMEPAGE="${EGIT_REPO_URI}"
+HOMEPAGE="https://gitlab.com/jschx/ufetch"
 LICENSE="ISC"
 
+RESTRICT="mirror test"
+
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 src_install() {
 	exeinto /usr/bin &&
diff --git a/app-misc/ufetch/ufetch-9999.ebuild b/app-misc/ufetch/ufetch-9999.ebuild
index fa1d76a952..712b151bec 100644
--- a/app-misc/ufetch/ufetch-9999.ebuild
+++ b/app-misc/ufetch/ufetch-9999.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://gitlab.com/jschx/${PN}"
 case "${PV}" in
 	"9999")
 		inherit git-r3
+		EGIT_REPO_URI="https://gitlab.com/jschx/ufetch.git"
 		;;
 	*)
 		P0="${PN}-v${PV}"
-		SRC_URI="${EGIT_REPO_URI}/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://gitlab.com/jschx/ufetch/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${P0}"
+		KEYWORDS="~amd64 ~x86"
 esac
 
 DESCRIPTION="Tiny system info for Unix-like operating systems"
-HOMEPAGE="${EGIT_REPO_URI}"
+HOMEPAGE="https://gitlab.com/jschx/ufetch"
 LICENSE="ISC"
 
+RESTRICT="mirror test"
+
 SLOT="0"
-KEYWORDS=""
 
 src_install() {
 	exeinto /usr/bin &&
diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index f999ba4b06..ffe055441b 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1 @@
-DIST usockets-0.6.0_p1.tar.gz 57634 BLAKE2B 67faa23add9c88dd49eed4849766e3eeeeaedd3993741ced9491d01b6d0caf56b032a9689827018714dbc87b500f3755db4edacb035573f7a563cd7147b1e187 SHA512 0dbedc5e90af9a92e6597e801116b57fd99dcd5a8488e3b5ddce83bbcd1852d30f2c8954dc1991a807d32f00bdb62e654498687fec344d295f299ccf3920a1ca
+DIST usockets-0.6.0_p20210126.tar.gz 57764 BLAKE2B 3ddcfaa684dec96a80f81424512bbd7a2fd8dd0724a0c20628aa76b5bb3e5b2177402b33feb8d046f3fa813288d3d3a5b8b18d7df8bd6a28b029162cdbe3b9ab SHA512 047b95a125b0a79ee4b301bb0c718aded6d6dbcafef64965ad6bcf14428b6569e67c2a9eb3d6d4bf3a2f4e2e46e978555507dec9047e6497823a880ae7deed03
diff --git a/net-libs/usockets/usockets-0.6.0_p1-r1.ebuild b/net-libs/usockets/usockets-0.6.0_p20210126.ebuild
similarity index 58%
rename from net-libs/usockets/usockets-0.6.0_p1-r1.ebuild
rename to net-libs/usockets/usockets-0.6.0_p20210126.ebuild
index bdd890be76..37f780764c 100644
--- a/net-libs/usockets/usockets-0.6.0_p1-r1.ebuild
+++ b/net-libs/usockets/usockets-0.6.0_p20210126.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
 else
-	COMMIT=7683672d87067cd75b854f4e36b9820f4809a4be
+	COMMIT=45a70140b191e74c66301e5fefdacbd298b8c518
 	SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/uSockets-${COMMIT}"
@@ -20,13 +20,11 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="libuv libressl +ssl static-libs"
+IUSE="libuv +ssl static-libs"
 
-DEPEND="ssl? (
-		!libressl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
-		libressl? ( dev-libs/libressl[static-libs?] )
-	)
+DEPEND="
 	libuv? ( dev-libs/libuv[static-libs?] )
+	ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
 "
 RDEPEND="${DEPEND}"
 
@@ -34,22 +32,17 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.6.0-Makefile.patch"
 )
 
-src_compile() {
+src_configure() {
 	tc-export CC CXX
-	# the Makefile uses environment variables
-	emake VERSION=${PV} \
-		  LIB="$(get_libdir)" \
-		  WITH_OPENSSL=$(usex ssl 1 0) \
-		  WITH_LIBUV=$(usex libuv 1 0) \
-		  default
+	export VERSION="${PV%_*}" \
+	       LIB="$(get_libdir)" \
+	       WITH_OPENSSL="$(usex ssl 1 0)"
+	       WITH_LIBUV="$(usex libuv 1 0)"
+	default
 }
 
 src_install() {
-	emake LIB="$(get_libdir)" \
-		  prefix="${EPREFIX%/}/usr" \
-		  DESTDIR="${D}" \
-		  VERSION=${PV} \
-		  install
+	default
 	einstalldocs
 	if ! use static-libs; then
 		rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index bdd890be76..37f780764c 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
 else
-	COMMIT=7683672d87067cd75b854f4e36b9820f4809a4be
+	COMMIT=45a70140b191e74c66301e5fefdacbd298b8c518
 	SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/uSockets-${COMMIT}"
@@ -20,13 +20,11 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="libuv libressl +ssl static-libs"
+IUSE="libuv +ssl static-libs"
 
-DEPEND="ssl? (
-		!libressl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
-		libressl? ( dev-libs/libressl[static-libs?] )
-	)
+DEPEND="
 	libuv? ( dev-libs/libuv[static-libs?] )
+	ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
 "
 RDEPEND="${DEPEND}"
 
@@ -34,22 +32,17 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.6.0-Makefile.patch"
 )
 
-src_compile() {
+src_configure() {
 	tc-export CC CXX
-	# the Makefile uses environment variables
-	emake VERSION=${PV} \
-		  LIB="$(get_libdir)" \
-		  WITH_OPENSSL=$(usex ssl 1 0) \
-		  WITH_LIBUV=$(usex libuv 1 0) \
-		  default
+	export VERSION="${PV%_*}" \
+	       LIB="$(get_libdir)" \
+	       WITH_OPENSSL="$(usex ssl 1 0)"
+	       WITH_LIBUV="$(usex libuv 1 0)"
+	default
 }
 
 src_install() {
-	emake LIB="$(get_libdir)" \
-		  prefix="${EPREFIX%/}/usr" \
-		  DESTDIR="${D}" \
-		  VERSION=${PV} \
-		  install
+	default
 	einstalldocs
 	if ! use static-libs; then
 		rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
diff --git a/net-misc/purritobin/purritobin-9999.ebuild b/net-misc/purritobin/purritobin-9999.ebuild
index fd9c61364f..3866d8372b 100644
--- a/net-misc/purritobin/purritobin-9999.ebuild
+++ b/net-misc/purritobin/purritobin-9999.ebuild
@@ -19,6 +19,8 @@ fi
 
 LICENSE="ISC"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	net-libs/usockets[ssl]
@@ -34,6 +36,10 @@ src_configure() {
 	tc-export CXX
 }
 
+src_test() {
+	emake check
+}
+
 src_install() {
 	emake PREFIX="/usr" MANDIR="/usr/share/man" DESTDIR="${ED}" install
 	insinto /var/www/purritobin
diff --git a/sys-process/iotop-c/Manifest b/sys-process/iotop-c/Manifest
index d72596fcaa..f8eba1a252 100644
--- a/sys-process/iotop-c/Manifest
+++ b/sys-process/iotop-c/Manifest
@@ -1 +1 @@
-DIST iotop-c-1.15.tar.gz 32454 BLAKE2B 465b43e7661c901f8a9f66973cf25a4af6dcac9e92cbb988240e454c52e1cce1359c57d2386f9773b19202fdbf2ccb2d177ee2a8587faa13e7f69bc8b29b0299 SHA512 feb1d2674b2407f3c9011aca1e4e00b68264b955939be94e45434519ecb8bfc0290ceb17a3db5dafb5a7fd38ccbe5522851439b4437edcf13d0864bc6b8c4364
+DIST iotop-c-1.16.tar.gz 37912 BLAKE2B f27e0f1edfe2ec61530355fd7cfe43078efdac77036c85efd289fa0c8005614ecf5112741bc24c0038c3e643bdc28793271166ec2b1a26fff827986d09292cd9 SHA512 c96077941857260935d9db3ea7d9f03ef0af9b7e9fed6ddffb8a3eece205f22da87deb21e0ab25ebd030e7d898140467f47585965e50f9a99e92db1236eb1a05
diff --git a/sys-process/iotop-c/iotop-c-1.15.ebuild b/sys-process/iotop-c/iotop-c-1.16.ebuild
similarity index 93%
rename from sys-process/iotop-c/iotop-c-1.15.ebuild
rename to sys-process/iotop-c/iotop-c-1.16.ebuild
index f76fee4040..033feb5343 100644
--- a/sys-process/iotop-c/iotop-c-1.15.ebuild
+++ b/sys-process/iotop-c/iotop-c-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/jackett-bin/Manifest b/www-apps/jackett-bin/Manifest
index 7b6dbedc98..90cb1820c8 100644
--- a/www-apps/jackett-bin/Manifest
+++ b/www-apps/jackett-bin/Manifest
@@ -1,3 +1,3 @@
-DIST jackett-bin-0.17.354-amd64.tar.gz 44621875 BLAKE2B 7587d487c8c0d84f64f3e323a55e62c2efa8fc68cb3403dd397d85d79b8af80cede0d55b7f6fd2369a174e19979a190e8e9e9c4923ff001d61d9c205e4b073ca SHA512 eed14eef2363f88f3fec948be38835e43c3b26e3a083d562baab80ffcfa6c1cadb4d6bcfbec068980cbf5a054978f5c93d833092cf48a0b402a87041cafa5a50
-DIST jackett-bin-0.17.354-arm.tar.gz 42509634 BLAKE2B c67299a27fcdd863401580225c739b5a9ac650a9c56dc83e7c3f376e42cc10a444e8945ef4462bb8f7e96db99be9b275433268c321fadab9a4685c6e77dab4f6 SHA512 4f7a64e7f5c63ce7305975aeadfde79610e62a985a351a4e64276aa5b6eb06f1bea24ed395b733cd689addf7a2b4ba0027ec0dd0fe57ebb2109571693069c3e8
-DIST jackett-bin-0.17.354-arm64.tar.gz 41871403 BLAKE2B c1e8510ef98840e07689d58df33538660c8e62c218264a911a21a16a981cee8952e872ff3349ac21f9cf2b7cee3064fcdeaba878ee713df40b769707ab27b449 SHA512 faaab8bb42166e0a74ec06f45d30798c0ea475797cc7f42aa07bda2e8d245de05093bdb5dbb73096032ef458bec4d7c1607d484bf3a247f548aa415c06c571d5
+DIST jackett-bin-0.17.401-amd64.tar.gz 44610424 BLAKE2B 02798806856f8dc51e22461549c76153f750f6f617ee85db51dd5573657a888967603896a2560ef0f74cf941a06cdc6f8e3b4d403299f02ac81b505874b80c8f SHA512 8ca569409c1311db15ce62cd8ec7e8bb10b3c24ac71386dbdaa7540b7152a87289cc44e9cd325e0e96884144f7dadff01d1ed8eaf907cea0449b2691f82ae089
+DIST jackett-bin-0.17.401-arm.tar.gz 42477815 BLAKE2B 031a342541089a80977565eb52a5b86a4e69df4fa5b561726cf8fbcb6c207b98760ec2d1b3be21b562b53af23447dce67ea321af7bfbdbf19e3e7a41a32bd01a SHA512 4bfbf7d7fdcfe08ccd60056b703533988bfe46a1d656e0f018c169042df266a8b48e46af29926dcbef8c80e339629ecf27894fdd73f24240c5becb8dacbf2ffa
+DIST jackett-bin-0.17.401-arm64.tar.gz 41839334 BLAKE2B c090dc791a21211cdc602f97e761d9361741fd961850afc4567f63bb6954d6308ce3590b1b3a583e7bca164c3aaf3702784bfdcc2a7d07d04cb595f3ec4a944b SHA512 ea33e421973792255195f0985e82d3a65d12a0b5a5838245bef6b306d28c84625959298fca8c4b0468d1f7ff1c5649f1651165f31918128aec1bae123cd1a190
diff --git a/www-apps/jackett-bin/jackett-bin-0.17.354.ebuild b/www-apps/jackett-bin/jackett-bin-0.17.401.ebuild
similarity index 100%
rename from www-apps/jackett-bin/jackett-bin-0.17.354.ebuild
rename to www-apps/jackett-bin/jackett-bin-0.17.401.ebuild
diff --git a/www-apps/uwebsockets/Manifest b/www-apps/uwebsockets/Manifest
index 89e2739aa3..57e867f0bb 100644
--- a/www-apps/uwebsockets/Manifest
+++ b/www-apps/uwebsockets/Manifest
@@ -1,2 +1 @@
-DIST uwebsockets-18.17.0.tar.gz 276629 BLAKE2B 2d53fc5eefd7ef97af4d5c5afea9aaa8bf330083f3d55d68d7210e5825c9179f93d7f78f96a32c7b0c4ea18e1a078e4954706b8782aa1f62206f11dfb4dbfae5 SHA512 8e7cd716eddc9f9c3bcbc24ed50eaba39f3bc920624f892045caa14bc241695f8ccd531a3aaab6870e8669a49788058ea6458b11298aab1757923f3d7caa7813
-DIST uwebsockets-18.19.0.tar.gz 278092 BLAKE2B ba9d5170052698ee008ccf1609b93b88990fef3dd8eb68d907fc04939a4c9e045a0e6d3b4524b4c5f5381e2f7f3ebfa114df39550e73e9ddc189068e1dce6ef1 SHA512 6419c180e523b292bc25bcde275a8a0c2dca9c21bb189c37a934ef99e087ce110bee67bdb5ce51309c26426dd06921498a5a9cb411b77277d1b6d93c8c7a3ec5
+DIST uwebsockets-18.23.0.tar.gz 280174 BLAKE2B aab7f1b4cd0d89d2fd4c35d08932e29596297a3f62dd6063d6683116e02158532519ede3eec5362490ebf07fbd625684aba546ffdee46c34daf66103e9127153 SHA512 f0fdeac4efee55abfe83203cb525c5878755d68b08bcd50c43890bf209469f0476a0a76cae3490e4f679f1c140c1740f93bcabcd9d1513ed1bdd3958eef33c63
diff --git a/www-apps/uwebsockets/uwebsockets-18.17.0.ebuild b/www-apps/uwebsockets/uwebsockets-18.17.0.ebuild
deleted file mode 100644
index d6c2b03566..0000000000
--- a/www-apps/uwebsockets/uwebsockets-18.17.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="ultra fast, simple, secure & standards compliant web I/O"
-HOMEPAGE="https://github.com/uNetworking/uWebSockets"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/uNetworking/uWebSockets.git"
-else
-	SRC_URI="https://github.com/uNetworking/uWebSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/uWebSockets-${PV}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-RDEPEND=">=net-libs/usockets-0.6.0"
-
-src_prepare() {
-	default
-	mv src uWebSockets
-}
-
-src_compile() {
-	return 0
-}
-
-src_install() {
-	doheader -r uWebSockets
-}
diff --git a/www-apps/uwebsockets/uwebsockets-18.19.0.ebuild b/www-apps/uwebsockets/uwebsockets-18.23.0.ebuild
similarity index 100%
rename from www-apps/uwebsockets/uwebsockets-18.19.0.ebuild
rename to www-apps/uwebsockets/uwebsockets-18.23.0.ebuild