diff --git a/dev-python/pyfiglet/Manifest b/dev-python/pyfiglet/Manifest
index 2d03afcd90..1d5c74eb0f 100644
--- a/dev-python/pyfiglet/Manifest
+++ b/dev-python/pyfiglet/Manifest
@@ -1,2 +1,2 @@
-DIST pyfiglet-0.8.0.tar.gz 634587 BLAKE2B 6ceec287f854662a0d0cbb6de285c91f1088e6fa2626a26445a98c18f98c8e6fb648b6f6f2fc1cfb160657423a24ec8ec8f9183e078393f336edc1db08eb8e9e SHA512 43f0497ae86139e8f64c45e41e575aa82eee574331739e96c555ca33e8f6900df6487d3220667188891eacd56e00d716d427479337fe5d6b2efdaa6aaaa64376
-DIST pyfiglet-0.8.1.tar.gz 634618 BLAKE2B 49268581974e72f28ddb11785a1629a4ac2696bcdd57710147cafdcf7709be8c67bdf03e5ccdb1655a9be6eb8a83baf4ca5ae0a6412e2318d0923376558b8d49 SHA512 3b8c7b4c9ae48466da3ccc6711aac9c35b08a373abbdda66c60a62f17ba6edd316b0d5e3085613f7c44fbaa2f02acc4a5b3830a31d22437d9261863878421400
+DIST pyfiglet-0.8_p0.tar.gz 634587 BLAKE2B 6ceec287f854662a0d0cbb6de285c91f1088e6fa2626a26445a98c18f98c8e6fb648b6f6f2fc1cfb160657423a24ec8ec8f9183e078393f336edc1db08eb8e9e SHA512 43f0497ae86139e8f64c45e41e575aa82eee574331739e96c555ca33e8f6900df6487d3220667188891eacd56e00d716d427479337fe5d6b2efdaa6aaaa64376
+DIST pyfiglet-0.8_p1.tar.gz 634618 BLAKE2B 49268581974e72f28ddb11785a1629a4ac2696bcdd57710147cafdcf7709be8c67bdf03e5ccdb1655a9be6eb8a83baf4ca5ae0a6412e2318d0923376558b8d49 SHA512 3b8c7b4c9ae48466da3ccc6711aac9c35b08a373abbdda66c60a62f17ba6edd316b0d5e3085613f7c44fbaa2f02acc4a5b3830a31d22437d9261863878421400
diff --git a/dev-python/pyfiglet/pyfiglet-0.8.0.ebuild b/dev-python/pyfiglet/pyfiglet-0.8_p0.ebuild
similarity index 94%
rename from dev-python/pyfiglet/pyfiglet-0.8.0.ebuild
rename to dev-python/pyfiglet/pyfiglet-0.8_p0.ebuild
index 2bdfd98973..35776c9e87 100644
--- a/dev-python/pyfiglet/pyfiglet-0.8.0.ebuild
+++ b/dev-python/pyfiglet/pyfiglet-0.8_p0.ebuild
@@ -15,7 +15,7 @@ then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/pwaller/pyfiglet.git"
 else
-	MY_PV="$(ver_cut 1-2).post$(ver_cut 3)"
+	MY_PV="$(ver_cut 1-2).post$(ver_cut 4)"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://files.pythonhosted.org/packages/source/p/pyfiglet/${MY_P}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/pyfiglet/pyfiglet-0.8.1.ebuild b/dev-python/pyfiglet/pyfiglet-0.8_p1.ebuild
similarity index 94%
rename from dev-python/pyfiglet/pyfiglet-0.8.1.ebuild
rename to dev-python/pyfiglet/pyfiglet-0.8_p1.ebuild
index 2bdfd98973..35776c9e87 100644
--- a/dev-python/pyfiglet/pyfiglet-0.8.1.ebuild
+++ b/dev-python/pyfiglet/pyfiglet-0.8_p1.ebuild
@@ -15,7 +15,7 @@ then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/pwaller/pyfiglet.git"
 else
-	MY_PV="$(ver_cut 1-2).post$(ver_cut 3)"
+	MY_PV="$(ver_cut 1-2).post$(ver_cut 4)"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://files.pythonhosted.org/packages/source/p/pyfiglet/${MY_P}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/pyfiglet/pyfiglet-9999.ebuild b/dev-python/pyfiglet/pyfiglet-9999.ebuild
index 2bdfd98973..35776c9e87 100644
--- a/dev-python/pyfiglet/pyfiglet-9999.ebuild
+++ b/dev-python/pyfiglet/pyfiglet-9999.ebuild
@@ -15,7 +15,7 @@ then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/pwaller/pyfiglet.git"
 else
-	MY_PV="$(ver_cut 1-2).post$(ver_cut 3)"
+	MY_PV="$(ver_cut 1-2).post$(ver_cut 4)"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://files.pythonhosted.org/packages/source/p/pyfiglet/${MY_P}.tar.gz -> ${P}.tar.gz"
diff --git a/games-util/legendary/Manifest b/games-util/legendary/Manifest
index a3d8717a7d..3228216817 100644
--- a/games-util/legendary/Manifest
+++ b/games-util/legendary/Manifest
@@ -1,2 +1,2 @@
-DIST legendary-0.20.3.tar.gz 78618 BLAKE2B 5d779364b07eb949d392c808e1a4034a7516a0bbb7b5db0c01a07bdcaa0228040f169f817a99921e90749a3f331cad88037ae9881350c2bc0d12669520d1fbd7 SHA512 59c4189cc5cf6d4524acba8454defd89bdb66e3386d42e6d9604f6a38e9108e0ae03ec0e8fce8a181f3b4328cc24dadef2718d97290c2472544a0b124b1ffc9e
 DIST legendary-0.20.4.tar.gz 79394 BLAKE2B 7b4279e7beefc785bf331047cbdd01ef5005630594620665d7ef33e46b728b7d287008c4f92ca1af44ba8fc8442265f50c902aa034c02ec974bd9a219b4cc148 SHA512 13e819a630d21932295c7890b37d249f4c26b9518c86e884a747d742397dc1551190d91efe670139779da961fb52d186a65c52aa5d007eece145ce5701fbaf26
+DIST legendary-0.20.5.tar.gz 81244 BLAKE2B a1d0747bf0d5dd81341453038ef29b4ec78b5fa0e4cb8f40118b99391909f0d1a519490046276c6cb65f97a665216432458b049cfed32e2c5b5cb17feb957627 SHA512 8b5055ab63a822baa030dfea9da810aafae66cc5b16dd8e220fc7cc4d95945174031dccc355b1253554e0fac8bee13cd133ce4e2158ba2ca2521ed27c1b20541
diff --git a/games-util/legendary/legendary-0.20.3.ebuild b/games-util/legendary/legendary-0.20.5.ebuild
similarity index 100%
rename from games-util/legendary/legendary-0.20.3.ebuild
rename to games-util/legendary/legendary-0.20.5.ebuild
diff --git a/x11-misc/betterlockscreen_rapid/Manifest b/x11-misc/betterlockscreen_rapid/Manifest
new file mode 100644
index 0000000000..bb1ce741be
--- /dev/null
+++ b/x11-misc/betterlockscreen_rapid/Manifest
@@ -0,0 +1 @@
+DIST betterlockscreen_rapid-0.0.0_pre20201222.tar.gz 1837065 BLAKE2B 13d119c7e9514778cb65d97e55ec62861e157a4f69d74366de58250511d1f51214f525245bdee3ad7dd2fcffe6fda70f66f1e47576c3c21903b6256a67e0d5e6 SHA512 9b3f7a0783de8083b31950ed0bad73396a904d42f613edd55b4e0f03e465c5c1fae2acda70b8737ec3e1e33ea4534d15725b5f0f96a52f3a9e338032af49b169
diff --git a/x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-0.0.0_pre20201222.ebuild b/x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-0.0.0_pre20201222.ebuild
new file mode 100644
index 0000000000..9c3077e37c
--- /dev/null
+++ b/x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-0.0.0_pre20201222.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_REV="705f03ace10e273ced75ffa98bc5983c4b3ebecb"
+
+DESCRIPTION="A rapid and good-looking screen locker"
+HOMEPAGE="https://github.com/oakszyjrnrdy/betterlockscreen_rapid"
+SRC_URI="https://github.com/oakszyjrnrdy/betterlockscreen_rapid/archive/${MY_REV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_REV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	x11-misc/i3lock-color
+	x11-misc/i3lock-fancy-rapid
+"
+
+src_install() {
+	dobin betterlockscreen_rapid
+	einstalldocs
+	insinto /etc
+	doins betterlockscreen_rapid.conf
+}
diff --git a/x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-9999.ebuild b/x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-9999.ebuild
index 055a321c74..8713747541 100644
--- a/x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-9999.ebuild
+++ b/x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-9999.ebuild
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit git-r3
 
 DESCRIPTION="A rapid and good-looking screen locker"
 HOMEPAGE="https://github.com/oakszyjrnrdy/betterlockscreen_rapid"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/oakszyjrnrdy/betterlockscreen_rapid.git"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 
 RDEPEND="
 	x11-misc/i3lock-color
@@ -18,7 +18,8 @@ RDEPEND="
 "
 
 src_install() {
-	dobin "${PN}"
+	dobin betterlockscreen_rapid
+	einstalldocs
 	insinto /etc
-	doins "${PN}.conf"
+	doins betterlockscreen_rapid.conf
 }
diff --git a/x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild b/x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild
index 7246c98240..4a9e1e32c4 100644
--- a/x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild
+++ b/x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild
@@ -5,9 +5,10 @@ EAPI=7
 
 MY_PV="$(ver_cut 1-2).c.$(ver_cut 3)"
 
-DESCRIPTION="Improved i3lock with color customization"
+DESCRIPTION="The world's most popular non-default computer lockscreen"
 HOMEPAGE="https://github.com/Raymo111/i3lock-color"
 SRC_URI="https://github.com/Raymo111/i3lock-color/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="i3lock-color"
 SLOT="0"
@@ -31,8 +32,6 @@ RDEPEND="
 "
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_configure() {
 	autoreconf -fiv
 	default
diff --git a/x11-misc/i3lock-color/i3lock-color-2.13.1.ebuild b/x11-misc/i3lock-color/i3lock-color-2.13.1.ebuild
index 7246c98240..4a9e1e32c4 100644
--- a/x11-misc/i3lock-color/i3lock-color-2.13.1.ebuild
+++ b/x11-misc/i3lock-color/i3lock-color-2.13.1.ebuild
@@ -5,9 +5,10 @@ EAPI=7
 
 MY_PV="$(ver_cut 1-2).c.$(ver_cut 3)"
 
-DESCRIPTION="Improved i3lock with color customization"
+DESCRIPTION="The world's most popular non-default computer lockscreen"
 HOMEPAGE="https://github.com/Raymo111/i3lock-color"
 SRC_URI="https://github.com/Raymo111/i3lock-color/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="i3lock-color"
 SLOT="0"
@@ -31,8 +32,6 @@ RDEPEND="
 "
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_configure() {
 	autoreconf -fiv
 	default
diff --git a/x11-misc/i3lock-color/i3lock-color-9999.ebuild b/x11-misc/i3lock-color/i3lock-color-9999.ebuild
index 19077212bb..8d085aa958 100644
--- a/x11-misc/i3lock-color/i3lock-color-9999.ebuild
+++ b/x11-misc/i3lock-color/i3lock-color-9999.ebuild
@@ -7,7 +7,7 @@ inherit git-r3
 
 DESCRIPTION="Improved i3lock with color customization"
 HOMEPAGE="https://github.com/Raymo111/i3lock-color"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/Raymo111/i3lock-color.git"
 
 LICENSE="i3lock-color"
 SLOT="0"
diff --git a/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-0.0.0_pre20201109.ebuild b/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-0.0.0_pre20201109.ebuild
index 961ef17432..849d23d7aa 100644
--- a/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-0.0.0_pre20201109.ebuild
+++ b/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-0.0.0_pre20201109.ebuild
@@ -10,6 +10,7 @@ MY_REV="c70ecfa8a529cb71f21f475f31d748ce9b154a8b"
 DESCRIPTION="A faster implementation of i3lock-fancy"
 HOMEPAGE="https://github.com/yvbbrjdr/i3lock-fancy-rapid"
 SRC_URI="https://github.com/yvbbrjdr/i3lock-fancy-rapid/archive/${MY_REV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_REV}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,8 +24,6 @@ RDEPEND="
 "
 DEPEND="x11-libs/libX11"
 
-S="${WORKDIR}"/i3lock-fancy-rapid-${MY_REV}
-
 src_prepare() {
 	default
 	sed -e "s/gcc/$(tc-getCC)/" \
@@ -38,6 +37,6 @@ src_configure() {
 }
 
 src_install() {
-	dobin "${PN}"
+	dobin i3lock-fancy-rapid
 	einstalldocs
 }
diff --git a/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-9999.ebuild b/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-9999.ebuild
index f9b0e9381f..f1f1cb0f49 100644
--- a/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-9999.ebuild
+++ b/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit git-r3
+inherit git-r3 flag-o-matic toolchain-funcs
 
 DESCRIPTION="A faster implementation of i3lock-fancy"
 HOMEPAGE="https://github.com/yvbbrjdr/i3lock-fancy-rapid"
@@ -33,6 +33,6 @@ src_configure() {
 }
 
 src_install() {
-	dobin "${PN}"
+	dobin i3lock-fancy-rapid
 	einstalldocs
 }