diff --git a/dev-python/pdoc3/Manifest b/dev-python/pdoc3/Manifest
new file mode 100644
index 0000000000..82043ca908
--- /dev/null
+++ b/dev-python/pdoc3/Manifest
@@ -0,0 +1 @@
+DIST pdoc3-0.9.2.tar.gz 84803 BLAKE2B 5ff52a630722b9504d1de83bb236aaaafde95417ac163b79b3585156484a12b71a16de55d00ab7377b9e44eec7902384f1f648a514b8e7392da6f5e79f6f229f SHA512 653231a124239ec189dc5aa4dec59245c6d20e4ff6ca9cb7fa468410b712b766288f4c59f8c0d0b8c1a4190ce84603455ec0ad7c7b1e0dc4f28cd279bb69685f
diff --git a/dev-python/pdoc3/metadata.xml b/dev-python/pdoc3/metadata.xml
new file mode 100644
index 0000000000..a2a8a044b6
--- /dev/null
+++ b/dev-python/pdoc3/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ flo@geekplace.eu
+ Florian Schmaus
+
+
+ pdoc3
+ pdoc3/pdoc
+
+
diff --git a/dev-python/pdoc3/pdoc3-0.9.2.ebuild b/dev-python/pdoc3/pdoc3-0.9.2.ebuild
new file mode 100644
index 0000000000..f495d6d7cc
--- /dev/null
+++ b/dev-python/pdoc3/pdoc3-0.9.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Auto-generate API documentation for Python projects"
+HOMEPAGE="https://pdoc3.github.io/pdoc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ dev-python/mako[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ ${RDEPEND}
+ dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+ sed -i \
+ -e "/setuptools_git/d" \
+ -e "/setuptools_scm/d" \
+ setup.py || die
+}
diff --git a/games-fps/crispy-doom/Manifest b/games-fps/crispy-doom/Manifest
index a9a9ba3628..3ecc10c3e5 100644
--- a/games-fps/crispy-doom/Manifest
+++ b/games-fps/crispy-doom/Manifest
@@ -1,4 +1,5 @@
DIST crispy-doom-5.10.0.tar.gz 2640909 BLAKE2B 67112cdb0b8a4caa1de9fc3fcd752be8775d154a5df194941bd1a024f607c9b7f0925994ed236a6e8f9579910af8dd29585f9fce77f72a1c20ab66177f7bca4d SHA512 b289939af35bbe3a933827fe834cbff8a267b6280749b27084abdf25174042bbdcaca313359258d7ab3fecacedd9b0f06b92624f2a7599ffff37a5e0db2436b1
+DIST crispy-doom-5.10.1.tar.gz 2649358 BLAKE2B 920df67f123218d737de1a1b147d96090a8ebb6021e4b532f30430441c8dcb4ef069e7045381a8ce8e8754d49a9595efa4d4700d4c3986728b9e2edfdc3d6c66 SHA512 134354c6692151902bd7f5349a88d5899e88f1f8e55499cb15f600c2c6cd0f89fa83dc17a26313b903bb801bd807ee1b5616d3cd5c7bda7e5d8e608a59194681
DIST crispy-doom-5.9.0.tar.gz 2641211 BLAKE2B a97bb7d9bda0c4e984054a0051cadfcaba7c758829bec9e615801bbf91dc1c8063decfedf5b76056cd2fb05e8fcf4113f19c10d72604399b715011d994af3e8b SHA512 9970291f374003ac2a1d9e4c44db18b97a41ae3348a5e100ec369affc162d681d15ce61846480667c8a7418700b78a4380bedab1e3acae77976eb4271a22b644
DIST crispy-doom-5.9.1.tar.gz 2640684 BLAKE2B 2bf862d8134689afba101abeed5cf1e1695378f235718941bf9fc2717bc93dd848173bb758e8bf0bc4a8ab1bfa75533c2ae838210326451f7c4285b0acb2e08b SHA512 1f9ed3520fe3d0fd176d3bcd6a2a3f5e730c29312ad20a4c1f692cc69881069efbf35d758dfcdafd402a499333dd2ae54764f4ec007375138ecf9cab84ebdbcd
DIST crispy-doom-5.9.2.tar.gz 2642419 BLAKE2B 63d9a89d6099485c79ff4cad69975de790b32a4ece4bded172ebf771a2bf1b4dcd21ab58383ca3c5eea32a4eff72e65ec0e3a283c85f1bc62be680de04f88e52 SHA512 bcd48a75d80b963e1b00b5acc5fc863c014cfde39f67efec50852667ed80545c78b4ed3f82b28762806f0aa3999ed26018dd6ccb34149c395409cd3c47509273
diff --git a/games-fps/crispy-doom/crispy-doom-5.10.1.ebuild b/games-fps/crispy-doom/crispy-doom-5.10.1.ebuild
new file mode 100644
index 0000000000..d862f61a75
--- /dev/null
+++ b/games-fps/crispy-doom/crispy-doom-5.10.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools prefix python-any-r1 xdg
+
+DESCRIPTION="A limit-removing enhanced-resolution Doom source port based on Chocolate Doom"
+HOMEPAGE="https://github.com/fabiangreffrath/crispy-doom"
+SRC_URI="https://github.com/fabiangreffrath/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion doc libsamplerate +midi png truecolor vorbis zlib"
+
+DEPEND="
+ media-libs/libsdl2[video]
+ media-libs/sdl2-mixer[midi?,vorbis?]
+ media-libs/sdl2-net
+ libsamplerate? ( media-libs/libsamplerate )
+ png? ( media-libs/libpng:= )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ bash-completion? ( ${PYTHON_DEPS} )
+ doc? ( ${PYTHON_DEPS} )"
+
+S="${WORKDIR}"/${PN}-${P}
+
+DOCS=(
+ "AUTHORS"
+ "ChangeLog"
+ "NEWS.md"
+ "NOT-BUGS.md"
+ "PHILOSOPHY.md"
+ "README.md"
+ "README.Music.md"
+ "README.Strife.md"
+)
+
+src_prepare() {
+ default
+
+ hprefixify src/d_iwad.c
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable bash-completion) \
+ $(use_enable doc) \
+ --disable-fonts \
+ --disable-icons \
+ $(use_with libsamplerate) \
+ $(use_with png libpng) \
+ $(use_enable truecolor) \
+ $(use_with zlib)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Remove redundant documentation files
+ rm -r "${ED}/usr/share/doc/"* || die
+
+ einstalldocs
+}
diff --git a/gui-apps/sfwbar/Manifest b/gui-apps/sfwbar/Manifest
index 0d6a2cfb91..cc3ee9336b 100644
--- a/gui-apps/sfwbar/Manifest
+++ b/gui-apps/sfwbar/Manifest
@@ -1,2 +1,3 @@
DIST sfwbar-0.9.4.tar.gz 90159 BLAKE2B c1f0fdd77469c231f8bb7e0862049979354e076427ad08ca5fe6383fac44b424b5583041a21425bfaa490f872fa0757214e7796d187f9fc7cb62b22d6b65c039 SHA512 e2cbe1bb6f89dd9632e21d9f008267bae2ef62c63e54021c791d3f24c09c817b3670509d3be29a23795c50e63e78330fdbbc1ab6b527c012585e28950958171d
DIST sfwbar-0.9.6.tar.gz 94580 BLAKE2B faf6c4fc1e78cc8362e9acbdef6860f766e18bee0f8fa5e7d658fdfbd39cc786ac8c1266554ecc7d3de4d9a81b52760acc3b1dbc947d76e11c862aac2254582e SHA512 37045491bdd6389401f9fb2daec48fa361bb60aea340b56c9c05692614407d3f4a94c73d4800d20bd78a58531570a8114a0aa7dbbb506e06b029f8c82f9ffb99
+DIST sfwbar-0.9.7.tar.gz 98524 BLAKE2B 151c0065584858bc3f7e0d092df859840b1806c4f122962e160b9211fc7b6fbfc99febb02f98eb798ef986e37e9e52e5b3d4ec1f36f5da7e9766b8598c014e1f SHA512 e9f214eaf1fa9741fd32c3689b3eb7c9ac1db831c327f7d6e55b876e50dade1514091083e4ee0ab7f3cbc69e07e7f8f73242a54c5ffbb2fddfd1bddb8d33b591
diff --git a/gui-apps/sfwbar/sfwbar-0.9.7.ebuild b/gui-apps/sfwbar/sfwbar-0.9.7.ebuild
new file mode 100644
index 0000000000..0c44909c76
--- /dev/null
+++ b/gui-apps/sfwbar/sfwbar-0.9.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Sway Floating Window Bar"
+HOMEPAGE="https://github.com/LBCrion/sfwbar"
+SRC_URI="https://github.com/LBCrion/sfwbar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ >=x11-libs/gtk+-3.22.0:3[introspection,wayland]
+ gui-libs/gtk-layer-shell
+ dev-libs/libucl
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
diff --git a/net-analyzer/munin-contrib/Manifest b/net-analyzer/munin-contrib/Manifest
new file mode 100644
index 0000000000..1d89e5d2c6
--- /dev/null
+++ b/net-analyzer/munin-contrib/Manifest
@@ -0,0 +1 @@
+DIST munin-contrib-0_p20210318.tar.gz 6777350 BLAKE2B 5899abd4fa71f248d9da2fb4bafdac55ee054602339119b0ad5ba1098745c99859c1c56d800070538d0f6612bb155eedb24584f41e7c281f88fe2e348da8af30 SHA512 4500f625798a09eff4d8ab41226d166086748fdaf5b77c0826b62b165da299c7d9151a29eefc92ec5f602218c75760ea050bd548f22d3987193d1538f732e17a
diff --git a/net-analyzer/munin-contrib/metadata.xml b/net-analyzer/munin-contrib/metadata.xml
new file mode 100644
index 0000000000..e21a6d882b
--- /dev/null
+++ b/net-analyzer/munin-contrib/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
+ munin-monitoring/contrib
+
+
+
diff --git a/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild b/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild
new file mode 100644
index 0000000000..1a2ce0affe
--- /dev/null
+++ b/net-analyzer/munin-contrib/munin-contrib-0_p20210318.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+COMMIT="7fd554f04b67a985e99f15aa56aa4546d6006f2f"
+
+SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+DESCRIPTION="user contributed stuff related to munin"
+HOMEPAGE="https://github.com/munin-monitoring/contrib"
+LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+" #TODO: investigate all the licenses
+SLOT="0"
+IUSE="examples +plugins templates tools"
+RDEPEND="net-analyzer/munin"
+
+S="${WORKDIR}/contrib-${COMMIT}"
+
+src_prepare() {
+ default
+}
+
+src_configure() {
+ return
+}
+
+src_compile() {
+ return
+}
+
+src_install() {
+ insinto "/usr/libexec/munin"
+ use tools && doins -r tools
+ insinto "/usr/libexec/munin/plugins/contrib"
+ use plugins && doins -r plugins/*
+ insinto "/etc/munin/templates"
+ use templates && doins -r templates/munstrap
+ use examples && dodoc -r samples/munin.conf
+ dodoc README.md
+}
diff --git a/sys-process/iotop-c/Manifest b/sys-process/iotop-c/Manifest
index f8eba1a252..c75022f704 100644
--- a/sys-process/iotop-c/Manifest
+++ b/sys-process/iotop-c/Manifest
@@ -1 +1 @@
-DIST iotop-c-1.16.tar.gz 37912 BLAKE2B f27e0f1edfe2ec61530355fd7cfe43078efdac77036c85efd289fa0c8005614ecf5112741bc24c0038c3e643bdc28793271166ec2b1a26fff827986d09292cd9 SHA512 c96077941857260935d9db3ea7d9f03ef0af9b7e9fed6ddffb8a3eece205f22da87deb21e0ab25ebd030e7d898140467f47585965e50f9a99e92db1236eb1a05
+DIST iotop-c-1.17.tar.gz 40456 BLAKE2B 6698d6a71b945b15cca0244611995a0c2de932613f0e0fe4dcb3e10a6ad495fd56318d16c9d3ae9a896e9d735ead748f13bd085ca152fccc370be2755383bc5a SHA512 80a9eee8998aa68b81f1c40067e5da5ae703b0e4f29f41a9e9a8cb9eb40eecfb2bedfc952519b7a22d62e1c273a15d1b36e25e693142af99a45876bfb3e16eaf
diff --git a/sys-process/iotop-c/iotop-c-1.16.ebuild b/sys-process/iotop-c/iotop-c-1.17.ebuild
similarity index 100%
rename from sys-process/iotop-c/iotop-c-1.16.ebuild
rename to sys-process/iotop-c/iotop-c-1.17.ebuild