diff --git a/app-accessibility/speakup-tools/Manifest b/app-accessibility/speakup-tools/Manifest
new file mode 100644
index 0000000000..ab26639b0d
--- /dev/null
+++ b/app-accessibility/speakup-tools/Manifest
@@ -0,0 +1 @@
+DIST speakup-tools-c4e89ab30116fbe22cb9fed4e22f4340fdbcfc4d.tar.gz 10830 BLAKE2B fe76362ecf7a14f2876128a340a5dcc5557503aad8ab03ee6174d8c73ca33b50079ec6932c8ee5eb577c5cdcb54aafb94a864cc5690d29e9e4dd4fca1c7e23e9 SHA512 e354b6db7aed703044931536f58fbb11fd6068d0a4795ae13041fdba14d83b71cbe4dabc002e3fbed38d96a1ae379926b6a0e8ce04f78defb30f35533ce0acf0
diff --git a/app-accessibility/speakup-tools/metadata.xml b/app-accessibility/speakup-tools/metadata.xml
new file mode 100644
index 0000000000..80b0fdba1e
--- /dev/null
+++ b/app-accessibility/speakup-tools/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<longdescription>
+		- speakupconf allows one to save and restore speakup's customizable variables.
+		- speakup_setlocale allows one to choose another language so that speakup's messages are localized.
+		- talkwith allows one to easily switch between speech synthesizers.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-accessibility/speakup-tools/speakup-tools-20121017.ebuild b/app-accessibility/speakup-tools/speakup-tools-20121017.ebuild
new file mode 100644
index 0000000000..a28837452c
--- /dev/null
+++ b/app-accessibility/speakup-tools/speakup-tools-20121017.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="c4e89ab30116fbe22cb9fed4e22f4340fdbcfc4d"
+DESCRIPTION="Tools to customize speakup module"
+HOMEPAGE="https://salsa.debian.org/a11y-team/speakup-tools"
+SRC_URI="https://salsa.debian.org/a11y-team/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}"/usr install
+	einstalldocs
+}
diff --git a/app-editors/atom-bin/atom-bin-1.57.0.ebuild b/app-editors/atom-bin/atom-bin-1.57.0-r1.ebuild
similarity index 92%
rename from app-editors/atom-bin/atom-bin-1.57.0.ebuild
rename to app-editors/atom-bin/atom-bin-1.57.0-r1.ebuild
index 1105226399..bbd1b653d8 100644
--- a/app-editors/atom-bin/atom-bin-1.57.0.ebuild
+++ b/app-editors/atom-bin/atom-bin-1.57.0-r1.ebuild
@@ -68,6 +68,10 @@ src_install(){
 	fperms +x /opt/"${PN}"/resources/app/apm/bin/node
 	fperms +x /opt/"${PN}"/resources/app/apm/bin/npm
 
+	# Bug 798459
+	fperms +x /opt/"${PN}"/resources/app.asar.unpacked/node_modules/vscode-ripgrep/bin/rg
+	fperms +x /opt/"${PN}"/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
+
 	doicon atom.png
 	make_desktop_entry "/opt/atom-bin/atom %U" "Atom" "atom" \
 		"GNOME;GTK;Utility;TextEditor;Development;" \
diff --git a/app-editors/imhex/imhex-1.8.1.ebuild b/app-editors/imhex/imhex-1.8.1.ebuild
index 8f9fd4480e..5687141618 100644
--- a/app-editors/imhex/imhex-1.8.1.ebuild
+++ b/app-editors/imhex/imhex-1.8.1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
 
 DEPEND="
 	${PYTHON_DEPS}
-	app-forensics/yara
+	app-forensics/yara[tcmalloc]
 	dev-cpp/nlohmann_json
 	dev-cpp/xdgpp
 	dev-libs/capstone
diff --git a/app-misc/liquidctl/Manifest b/app-misc/liquidctl/Manifest
index c5bdc63324..6811329bfc 100644
--- a/app-misc/liquidctl/Manifest
+++ b/app-misc/liquidctl/Manifest
@@ -1 +1 @@
-DIST liquidctl-1.4.2.tar.gz 159500 BLAKE2B a307949798c779f0a45494b0353f45b1a1d957fc9e5d3eeb9eefaaa03b82e4df1c5a9adce3bc025caf2a95745b225a112780ba6a426367ee45aa868c1f1620e5 SHA512 06a832c1e4784def449e64b9c119cf9fc8554932644d0126ad24ce1ab68995ea510e5473db2bdd8f1d20d4d5f505f21ecbf4ae490b6984fb87407ea9e6bfb58e
+DIST liquidctl-1.7.0.tar.gz 2036796 BLAKE2B 38227ee16daa769c72b6070e23885f14fce3695db01a5b278b37d570cf9c293d8e7442d9f71e26fe3d50890c8cdcd59114539b014c14d3fc6aeca888bfb652da SHA512 f13925cebad63996475f0535d2db0a0cfb5177a83aebceba0ab45600ab1c175cb76bfb351118acfd4995eec44a75acd86b7b7539d69e999525a3aa9cd88f16ed
diff --git a/app-misc/liquidctl/liquidctl-1.4.2.ebuild b/app-misc/liquidctl/liquidctl-1.7.0.ebuild
similarity index 71%
rename from app-misc/liquidctl/liquidctl-1.4.2.ebuild
rename to app-misc/liquidctl/liquidctl-1.7.0.ebuild
index b4d2acfa1b..547ab6c450 100644
--- a/app-misc/liquidctl/liquidctl-1.4.2.ebuild
+++ b/app-misc/liquidctl/liquidctl-1.7.0.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 udev
 
 DESCRIPTION="Cross-platform tool and drivers for liquid coolers and other devices"
-HOMEPAGE="https://github.com/jonasmalacofilho/liquidctl"
-SRC_URI="https://github.com/jonasmalacofilho/liquidctl/releases/download/v${PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/liquidctl/liquidctl"
+SRC_URI="https://github.com/liquidctl/liquidctl/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
+	dev-python/colorlog[${PYTHON_USEDEP}]
 	dev-python/docopt[${PYTHON_USEDEP}]
 	dev-python/hidapi[${PYTHON_USEDEP}]
 	dev-python/pyusb[${PYTHON_USEDEP}]
+	sys-apps/i2c-tools[${PYTHON_USEDEP},python]
 "
 
 distutils_enable_tests pytest
diff --git a/app-misc/liquidctl/metadata.xml b/app-misc/liquidctl/metadata.xml
index 8e9aedf815..abd809ae8f 100644
--- a/app-misc/liquidctl/metadata.xml
+++ b/app-misc/liquidctl/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Alexey Sokolov</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">jonasmalacofilho/liquidctl</remote-id>
+		<remote-id type="github">liquidctl/liquidctl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/xdgpp/xdgpp-0_pre20201007.ebuild b/dev-cpp/xdgpp/xdgpp-0_pre20201007.ebuild
index fa239e1315..45399ce123 100644
--- a/dev-cpp/xdgpp/xdgpp-0_pre20201007.ebuild
+++ b/dev-cpp/xdgpp/xdgpp-0_pre20201007.ebuild
@@ -23,7 +23,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
 
-DEPEND="test? ( dev-cpp/catch )"
+RDEPEND="dev-cpp/catch:0"
+DEPEND="${RDEPEND}"
 
 RESTRICT="!test? ( test )"
 PATCHES=(
diff --git a/dev-python/hstspreload/Manifest b/dev-python/hstspreload/Manifest
index fd8ecdcbcf..6046f81451 100644
--- a/dev-python/hstspreload/Manifest
+++ b/dev-python/hstspreload/Manifest
@@ -1 +1 @@
-DIST hstspreload-2021.3.22.tar.gz 1093674 BLAKE2B 0c09151aae493b44a1363ac9eac40b8196e80f39197ba754bba69c593465229cf9e38142c65bf7b59fe277491bc4f248e5940241ce0e1add122be268c3b4804d SHA512 2ae83a0961d307900518c05b12a7304a09e558beefc5eb0d56ae3d21b61184f1bc20d925f8919b71e2d10029c2ad6e92db3bbbaf04a804fdef614513d06d03b5
+DIST hstspreload-2021.7.5.tar.gz 1212079 BLAKE2B eba71d75a7cd384922ec4fbc7a153d432b80b6c9bff9e799c6f2a72c86603d34bc77e19f45e6dd80140fa53c11f3c5b7688614011bea22a8edfd260d23cd9020 SHA512 a294a078c96a95427307921565c7568ff6b20b51e4b8fba7e170e0d9d91b590ac73c32b9b5167c5086cc00ff6887ed69c669fdec3d240f9b96e6e215ca8daf00
diff --git a/dev-python/hstspreload/hstspreload-2021.3.22.ebuild b/dev-python/hstspreload/hstspreload-2021.7.5.ebuild
similarity index 85%
rename from dev-python/hstspreload/hstspreload-2021.3.22.ebuild
rename to dev-python/hstspreload/hstspreload-2021.7.5.ebuild
index eee0e38750..99c1b0a235 100644
--- a/dev-python/hstspreload/hstspreload-2021.3.22.ebuild
+++ b/dev-python/hstspreload/hstspreload-2021.7.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -19,6 +19,7 @@ LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
-RESTRICT="mirror"
+RESTRICT="test"
+PROPERTIES="test_network"
 
 distutils_enable_tests pytest
diff --git a/dev-python/statmake/metadata.xml b/dev-python/statmake/metadata.xml
index fac8946e18..b0d7494e58 100644
--- a/dev-python/statmake/metadata.xml
+++ b/dev-python/statmake/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
+    <maintainer type="person">
+        <description>co-maintainers welcome</description>
+        <email>lssndrbarbieri@gmail.com</email>
+        <name>Alessandro Barbieri</name>
+    </maintainer>
     <upstream>
         <bugs-to>https://github.com/daltonmaag/statmake/issues</bugs-to>
         <remote-id type="github">daltonmaag/statmake</remote-id>
diff --git a/dev-python/statmake/statmake-0.3.0.ebuild b/dev-python/statmake/statmake-0.3.0-r1.ebuild
similarity index 78%
rename from dev-python/statmake/statmake-0.3.0.ebuild
rename to dev-python/statmake/statmake-0.3.0-r1.ebuild
index 76567e93ba..e6a9b3de2a 100644
--- a/dev-python/statmake/statmake-0.3.0.ebuild
+++ b/dev-python/statmake/statmake-0.3.0-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 PYTHON_COMPAT=( python3_{8..9} )
 
@@ -17,13 +18,15 @@ SLOT="0"
 IUSE="test"
 
 RDEPEND="
-	dev-python/fonttools[${PYTHON_USEDEP}]
-	dev-python/cattrs[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/fonttools[${PYTHON_USEDEP}]
+	')
+	dev-python/cattrs[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="
 	${RDEPEND}
 	test? (
-		dev-python/ufo2ft[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/ufo2ft[${PYTHON_USEDEP}]')
 	)
 "
 
diff --git a/dev-python/taskflow/taskflow-4.5.0.ebuild b/dev-python/taskflow/taskflow-4.5.0.ebuild
index 035d9c4368..a059c53fb2 100644
--- a/dev-python/taskflow/taskflow-4.5.0.ebuild
+++ b/dev-python/taskflow/taskflow-4.5.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
 inherit distutils-r1
 
 DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
@@ -12,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -25,7 +26,6 @@ RDEPEND="
 	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/networkx-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/automaton-1.9.0[${PYTHON_USEDEP}]
@@ -34,4 +34,5 @@ RDEPEND="
 	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
 	>=dev-python/tenacity-6.0.0[${PYTHON_USEDEP}]
 	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pydot-1.2.4[${PYTHON_USEDEP}]"
+	>=dev-python/pydot-1.2.4[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/gftools/gftools-0.7.2.ebuild b/dev-util/gftools/gftools-0.7.2.ebuild
index ffd97dc72c..43d23fb3d0 100644
--- a/dev-util/gftools/gftools-0.7.2.ebuild
+++ b/dev-util/gftools/gftools-0.7.2.ebuild
@@ -24,6 +24,7 @@ RESTRICT="test"
 PROPERTIES="test_network"
 
 RDEPEND="
+	dev-python/statmake[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		app-arch/brotli[python,${PYTHON_USEDEP}]
 		dev-python/absl-py[${PYTHON_USEDEP}]
@@ -37,7 +38,6 @@ RDEPEND="
 		dev-python/pygit2[${PYTHON_USEDEP}]
 		dev-python/PyGithub[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/statmake[${PYTHON_USEDEP}]
 		dev-python/strictyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/tabulate[${PYTHON_USEDEP}]
diff --git a/dev-util/psautohint/psautohint-2.3.0.ebuild b/dev-util/psautohint/psautohint-2.3.0.ebuild
index 90713fbb32..325ca98946 100644
--- a/dev-util/psautohint/psautohint-2.3.0.ebuild
+++ b/dev-util/psautohint/psautohint-2.3.0.ebuild
@@ -75,5 +75,6 @@ python_test() {
 		--deselect tests/integration/test_hint.py::test_hashmap_old_version \
 		--deselect tests/integration/test_mmhint.py::test_vfotf[tests/integration/data/vf_tests/CJKSparseVar.subset.hinted.otf] \
 		--deselect tests/integration/test_mmhint.py::test_vfotf[tests/integration/data/vf_tests/bug816.hinted.otf] \
+		--deselect tests/integration/test_cli.py::test_multi_outpath \
 		|| die
 }
diff --git a/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.0.0.ebuild b/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.0.0.ebuild
index dca9d526a9..dbe48331e2 100644
--- a/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.0.0.ebuild
+++ b/games-puzzle/superflu-riteurnz/superflu-riteurnz-1.0.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Artisanal video-game about Superflu, the useless super-hero (french
 HOMEPAGE="https://ptilouk.net/superflu-riteurnz/"
 SRC_URI="
 	https://framagit.org/Gee/sosage/-/archive/v${PV}/${MY_P}.tar.gz
-	https://dl.bintray.com/ptilouk/superflu-riteurnz/zip/${MY_DATA_P}.zip
+	https://ptilouk.net/superflu-riteurnz/superflu-riteurnz-v1.0.0-xmas2020demo-data.zip
 "
 S="${WORKDIR}/${MY_P}"
 LICENSE="CC-BY-SA-2.0 GPL-3+ CC-BY-3.0"
diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest
index 636020c633..1a3dac3a96 100644
--- a/net-misc/gmid/Manifest
+++ b/net-misc/gmid/Manifest
@@ -1 +1 @@
-DIST gmid-1.6.1.tar.gz 59488 BLAKE2B 147c8eb4e1c7195405fdce9bef8260e1a3acb145e9dfd2cb3fb126e4445685a3a1826906b01699429e98a61db6bb2089ec3399a1403323b36adf2555afc61bf2 SHA512 b98592e4bb5b1121fad07dc1fcbdbc95ce69a5648b3c2d22dba974511ae265255be62a330125c2da9b0b357edc2f24065fd8b475013d3d2023a8eded2c01a490
+DIST gmid-1.6.2.tar.gz 60293 BLAKE2B 807f4e93d1ed0f2a69a9631504ffe28d5aee4efbba85b9e7d0a8eec5b4fb50a38285478651f196f57fbcf7b4d38ff462f78c37210720353af638d76b2b28e3e1 SHA512 053e2f95449d71c72052c422b1c51657ad48f662422a121452618c69e6bac9b23bbaa2b35b52d314eb7614b9a0f413504c87cd431bc756d455dd198c79270da8
diff --git a/net-misc/gmid/files/gmid-1.6.2-disable-runtime-test.patch b/net-misc/gmid/files/gmid-1.6.2-disable-runtime-test.patch
new file mode 100644
index 0000000000..c6cb8c19cd
--- /dev/null
+++ b/net-misc/gmid/files/gmid-1.6.2-disable-runtime-test.patch
@@ -0,0 +1,10 @@
+--- a/regress/Makefile
++++ b/regress/Makefile
+@@ -4,7 +4,6 @@
+ 
+ all: puny-test testdata iri_test cert.pem testca.pem valid.crt invalid.cert.pem
+ 	./puny-test
+-	./runtime
+ 	./iri_test
+ 
+ puny-test: puny-test.o ../puny.o ../utf8.o ../utils.o ../log.o ${COMPAT}
diff --git a/net-misc/gmid/files/gmid-1.6.1-make-pidfile.patch b/net-misc/gmid/files/gmid-1.6.2-make-pidfile.patch
similarity index 100%
rename from net-misc/gmid/files/gmid-1.6.1-make-pidfile.patch
rename to net-misc/gmid/files/gmid-1.6.2-make-pidfile.patch
diff --git a/net-misc/gmid/gmid-1.6.1.ebuild b/net-misc/gmid/gmid-1.6.2.ebuild
similarity index 57%
rename from net-misc/gmid/gmid-1.6.1.ebuild
rename to net-misc/gmid/gmid-1.6.2.ebuild
index dbf6b69ac1..fc7a027df2 100644
--- a/net-misc/gmid/gmid-1.6.1.ebuild
+++ b/net-misc/gmid/gmid-1.6.2.ebuild
@@ -3,33 +3,31 @@
 
 EAPI=7
 
-SSL_DEPS_SKIP=1
 SSL_DAYS=36500
-
 inherit ssl-cert toolchain-funcs
 
 DESCRIPTION="Simple and secure Gemini server"
 HOMEPAGE="https://www.omarpolo.com/pages/gmid.html"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.omarpolo.com/${PN}"
-else
-	SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+seccomp test"
+RESTRICT="!test? ( test )"
 
 PATCHES=( "${FILESDIR}"/${P}-make-pidfile.patch )
 
-DEPEND="acct-user/gemini
+DEPEND="
+	acct-user/gemini
 	dev-libs/libevent
 	dev-libs/libretls
 "
-BDEPEND="sys-devel/flex
-	virtual/yacc"
+BDEPEND="
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
 RDEPEND="${DEPEND}"
 
 DOCS=( README.md ChangeLog )
@@ -37,28 +35,46 @@ DOCS=( README.md ChangeLog )
 src_prepare() {
 	default
 
-	# QA Notice: command not found
-	# remove `etags` from the "all" target
-	sed \
-		-e "s/^\(all: .*\) TAGS \(.*\)$/\1 \2/" \
-		-i Makefile || die
+	if use seccomp && has usersandbox ${FEATURES} ; then
+		eapply "${FILESDIR}"/${P}-disable-runtime-test.patch
+	fi
 }
 
 src_configure() {
+	local conf_args
+
 	# note: not an autoconf configure script
-	./configure \
-		CC="$(tc-getCC)" \
-		PREFIX="${EPREFIX}"/usr/share \
-		BINDIR="${EPREFIX}"/usr/bin \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -ltls -lssl -lcrypto -levent" || die
+	conf_args=(
+		CC="$(tc-getCC)"
+		PREFIX="${EPREFIX}"/usr/share
+		BINDIR="${EPREFIX}"/usr/bin
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS} -ltls -lssl -lcrypto -levent"
+	)
+	if ! use seccomp ; then
+		conf_args+=( --disable-sandbox )
+	fi
+
+	./configure "${conf_args[@]}" || die
+}
+
+src_compile() {
+	emake gmid
+	if use test ; then
+		emake gg
+		emake -C regress puny-test testdata iri_test
+	fi
+}
+
+src_test() {
+	emake regress
 }
 
 src_install() {
 	default
 
-	dodir /etc/gmid
-	cp "${FILESDIR}"/gmid.conf "${ED}"/etc/gmid/gmid.conf || die
+	insinto /etc/gmid
+	doins "${FILESDIR}"/gmid.conf
 
 	newinitd "${FILESDIR}"/gmid.initd gmid
 	newconfd "${FILESDIR}"/gmid.confd gmid
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
index a5f8bc23bd..4818aacdb5 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -3,50 +3,68 @@
 
 EAPI=7
 
-SSL_DEPS_SKIP=1
 SSL_DAYS=36500
-
-inherit ssl-cert toolchain-funcs
+inherit git-r3 ssl-cert toolchain-funcs
 
 DESCRIPTION="Simple and secure Gemini server"
 HOMEPAGE="https://www.omarpolo.com/pages/gmid.html"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.omarpolo.com/${PN}"
-else
-	SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+EGIT_REPO_URI="https://github.com/omar-polo/${PN}.git https://git.omarpolo.com/${PN}"
 
 LICENSE="ISC"
 SLOT="0"
+IUSE="+seccomp test"
+RESTRICT="
+	!test? ( test )
+	seccomp? ( test )
+"
 
-DEPEND="acct-user/gemini
+DEPEND="
+	acct-user/gemini
 	dev-libs/libevent
 	dev-libs/libretls
 "
-BDEPEND="sys-devel/flex
-	virtual/yacc"
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
 RDEPEND="${DEPEND}"
 
 DOCS=( README.md ChangeLog )
 
 src_configure() {
+	local conf_args
+
 	# note: not an autoconf configure script
-	./configure \
-		CC="$(tc-getCC)" \
-		PREFIX="${EPREFIX}"/usr/share \
-		BINDIR="${EPREFIX}"/usr/bin \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -ltls -lssl -lcrypto -levent" || die
+	conf_args=(
+		CC="$(tc-getCC)"
+		PREFIX="${EPREFIX}"/usr/share
+		BINDIR="${EPREFIX}"/usr/bin
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS} -ltls -lssl -lcrypto -levent"
+	)
+	if ! use seccomp ; then
+		conf_args+=( --disable-sandbox )
+	fi
+
+	./configure "${conf_args[@]}" || die
+}
+
+src_compile() {
+	emake gmid
+	if use test ; then
+		emake -C regress gg puny-test testdata iri_test
+	fi
+}
+
+src_test() {
+	emake regress
 }
 
 src_install() {
 	default
 
-	dodir /etc/gmid
-	cp "${FILESDIR}"/gmid.conf "${ED}"/etc/gmid/gmid.conf || die
+	insinto /etc/gmid
+	doins "${FILESDIR}"/gmid.conf
 
 	newinitd "${FILESDIR}"/gmid.initd gmid
 	newconfd "${FILESDIR}"/gmid.confd gmid
diff --git a/sys-fs/dwarfs/Manifest b/sys-fs/dwarfs/Manifest
index 59b71c1693..af45f36f71 100644
--- a/sys-fs/dwarfs/Manifest
+++ b/sys-fs/dwarfs/Manifest
@@ -1,2 +1,2 @@
-DIST dwarfs-0.4.1.tar.bz2 11640169 BLAKE2B 3490d625fd718be4451d5a551b6931b0c9316d88cdda91b90a724f3ab732a3916431a13e343bcb79a2e0415ffc0a990d2546eeb1738c55282e9fb9c85d3ba1ae SHA512 ed7bfe13a9ed2450921a2caf47b4ee1f527fcd7ad154cee93d8674a2dd08c9110d62cfaff22f318bdb799eeea35b8bc4b7374d685537c82e70a0498d97a53307
 DIST dwarfs-0.5.4.tar.bz2 12155920 BLAKE2B 958acf2f47c26762d745f4f3ca350d518ce20095fa8fd613b33f9912b369acfedb61d2d11dbbcc718bbf6155652fbf46528b618393e8f98fb6c130b115bac061 SHA512 3affc809bab90dca6ea7b067e69da973f105524bdc8ec44a6b3e0f858f3e3c64438911b344afedbc67318fa1b0578a2f4aa7e69238319f837ea545000a36fbd5
+DIST dwarfs-0.5.6.tar.bz2 12146379 BLAKE2B 6d570de65358238eb8207297529f7cb632533eb6e63b5c27349add978d765e462fbeeb123962695b8092c919425454e7ef7cce6b2247ca46586b9732297ee1d1 SHA512 0b57f0ca5295d9b450cb0b9fd8086a87e29f0b010f70437374043689eb009f7ce10c2b862d7da3cc5613c305486c91866abe7840eb1fb09d00cde0d46f194ef6
diff --git a/sys-fs/dwarfs/dwarfs-0.4.1.ebuild b/sys-fs/dwarfs/dwarfs-0.5.6.ebuild
similarity index 86%
rename from sys-fs/dwarfs/dwarfs-0.4.1.ebuild
rename to sys-fs/dwarfs/dwarfs-0.5.6.ebuild
index 6b33a9eb2c..d788273ad1 100644
--- a/sys-fs/dwarfs/dwarfs-0.4.1.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.5.6.ebuild
@@ -16,11 +16,11 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
-IUSE="python +jemalloc"
+IUSE="python +jemalloc test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-DEPEND="sys-devel/flex
-		sys-devel/binutils:*"
+DEPEND="sys-devel/flex"
 RDEPEND="${PYTHON_DEPS}
 		dev-libs/boost[context,threads,python?]
 		dev-libs/double-conversion
@@ -42,6 +42,7 @@ RDEPEND="${PYTHON_DEPS}
 		sys-libs/libunwind
 		!dev-cpp/folly"
 BDEPEND="app-text/ronn
+		test? ( dev-cpp/gtest )
 		dev-util/cmake
 		sys-apps/sed
 		sys-devel/bison
@@ -65,8 +66,10 @@ src_configure(){
 	mycmakeargs=(
 		-DUSE_JEMALLOC=$(usex jemalloc ON OFF)
 		-DWITH_PYTHON=$(usex python ON OFF)
+		-DWITH_TESTS=$(usex test ON OFF)
 		-DPREFER_SYSTEM_ZSTD=1
 		-DPREFER_SYSTEM_XXHASH=1
+		-DPREFER_SYSTEM_GTEST=1
 		-DWITH_LEGACY_FUSE=0
 	)
 	if use python; then mycmakeargs+=( -DWITH_PYTHON_VERSION=${EPYTHON#python} ); fi
@@ -76,11 +79,12 @@ src_configure(){
 
 src_install(){
 	cmake_src_install
-	dolib.so libmetadata_thrift.so libthrift_light.so
+	dolib.so libmetadata_thrift.so libthrift_light.so libdwarfs.so libfsst.so
 	dolib.so folly/libfolly.so.0.58.0-dev folly/libfolly.so
 }
 
 pkg_postinst(){
+	elog "Suggest to enable USE 'threads' globally if you have multicore machine"
 	elog "Since version 0.4.1 GGC builds has been fixed. Now both Clang and GCC are working very well"
 	elog "You may find more information in the"
 	elog "${HOMEPAGE}"
diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest
index 1ce3db33de..a6e67c5d40 100644
--- a/sys-fs/erofs-utils/Manifest
+++ b/sys-fs/erofs-utils/Manifest
@@ -1 +1,2 @@
 DIST erofs-utils-1.2.1.tar.gz 61218 BLAKE2B 787d3c549020bf44d750ef1af8878c452683579ff545ed0a6b03a24fb5e5f559dad8dd1d00664598b7d42ec6f9d69800b087d0dcb0de147b51696b416903d712 SHA512 1b0fae6f1d7a5ee01f65e71e389c474d596be8800087beb063bfbda471c54d76f9d3f08da645cecb613b637044ff3f6b19d3c8647425261cec1646c87ad57802
+DIST erofs-utils-1.3.tar.gz 66135 BLAKE2B 1051cf387d059d71b91e0a940c86b819593902606ae4665a7801e9597dd72987385bee997d2d63b186c493557ee22118aff23161e48e25ee8f4859f9f6e46f14 SHA512 6ddd8402dab80b0375b012ed51ff02b40cbeca9a4a1ba250b14ec6aeb97317ab575e315e9d4dc77ed1d7826c202396d9c0775917106ecbd7b4048168aca0fa6c
diff --git a/sys-fs/erofs-utils/erofs-utils-1.3.ebuild b/sys-fs/erofs-utils/erofs-utils-1.3.ebuild
new file mode 100644
index 0000000000..ee37d4a497
--- /dev/null
+++ b/sys-fs/erofs-utils/erofs-utils-1.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Userspace tools for EROFS images"
+HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
+SRC_URI="${HOMEPAGE}/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="fuse lz4 selinux +uuid"
+
+RDEPEND="
+	fuse? ( sys-fs/fuse:0 )
+	lz4? ( >=app-arch/lz4-1.9 )
+	selinux? ( sys-libs/libselinux )
+	uuid? ( sys-apps/util-linux )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable fuse) \
+		$(use_enable lz4) \
+		$(use_with selinux) \
+		$(use_with uuid)
+}
+
+src_install() {
+	default
+	use fuse || rm "${ED}/usr/share/man/man1/erofsfuse.1" || die
+}
diff --git a/x11-terms/tabby-bin/tabby-bin-1.0.144.ebuild b/x11-terms/tabby-bin/tabby-bin-1.0.144.ebuild
index 43cbcc09fb..f9ce65f30e 100644
--- a/x11-terms/tabby-bin/tabby-bin-1.0.144.ebuild
+++ b/x11-terms/tabby-bin/tabby-bin-1.0.144.ebuild
@@ -49,8 +49,8 @@ src_prepare(){
 src_install(){
 	insinto /opt/"${PN}"
 	doins -r "${S}"/*
-	dosym ../../opt/"${PN}"/"${PN}" "${EPREFIX}"/usr/bin/"${PN}"
-	fperms +x /opt/"${PN}"/"${PN}"
+	dosym ../../opt/"${PN}"/tabby "${EPREFIX}"/usr/bin/tabby
+	fperms +x /opt/"${PN}"/tabby
 	make_desktop_entry "/opt/${PN}/tabby %U" "Tabby" "tabby" \
 		"GNOME;GTK;Utility;" \
 		"GenericName=Tabby\n\nStartupNotify=true\nStartupWMClass=tabby"