diff --git a/dev-libs/imsg-compat/imsg-compat-6.8.2.ebuild b/dev-libs/imsg-compat/imsg-compat-6.8.2.ebuild
index d972a94219..09651f485f 100644
--- a/dev-libs/imsg-compat/imsg-compat-6.8.2.ebuild
+++ b/dev-libs/imsg-compat/imsg-compat-6.8.2.ebuild
@@ -24,12 +24,17 @@ SLOT="0"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
+src_prepare() {
+	default
+	sed "s/@LIBDIR@/$(get_libdir)/" -i libimsg.pc.in || die
+}
+
 src_configure() {
 	tc-export CC AR
 }
 
 src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+	emake DESTDIR="${D}" PREFIX="${EPREIFX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
 	if ! use static-libs ; then
 		find "${ED}"/usr/$(get_libdir) -name "*.a" -delete || die
 	fi
diff --git a/dev-libs/imsg-compat/imsg-compat-9999.ebuild b/dev-libs/imsg-compat/imsg-compat-9999.ebuild
index d972a94219..09651f485f 100644
--- a/dev-libs/imsg-compat/imsg-compat-9999.ebuild
+++ b/dev-libs/imsg-compat/imsg-compat-9999.ebuild
@@ -24,12 +24,17 @@ SLOT="0"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
+src_prepare() {
+	default
+	sed "s/@LIBDIR@/$(get_libdir)/" -i libimsg.pc.in || die
+}
+
 src_configure() {
 	tc-export CC AR
 }
 
 src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+	emake DESTDIR="${D}" PREFIX="${EPREIFX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
 	if ! use static-libs ; then
 		find "${ED}"/usr/$(get_libdir) -name "*.a" -delete || die
 	fi
diff --git a/media-video/qliveplayer/Manifest b/media-video/qliveplayer/Manifest
index 8119f4ddb2..2653aa8ea7 100644
--- a/media-video/qliveplayer/Manifest
+++ b/media-video/qliveplayer/Manifest
@@ -1,2 +1,2 @@
-DIST QLivePlayer-3.22.1.tar.gz 640838 BLAKE2B 8552eefa4b8510b602e65fa553ba257467aaf5bd73710e90f690bcb19ceabc25dd4ae4f00143233df624f166f8170bf083aafbbec2d42e7988bd705037a9308e SHA512 45ec1f3d4d698a52107d07a7a55d457215d634b8106ac4facb9250960974f1ea683c338cedeb6f66fef428e88e05ef4286b3e95e22d23ed576c4bc69c5c7c50a
 DIST QLivePlayer-3.22.3.tar.gz 640956 BLAKE2B ed752d7321f90f70f68ab4366217116711b1f656eefc2f40b92572427dc11d168d2e9f88e6b0ba6c9e3024ede32922e06e04a208833858432e7ed923793b708d SHA512 c3ed5c8ffb4fa639132fdb0f42c20120a8e49c3e9135fe1234ec5eb6012e89a2e620ae4a3b669ecf995935c70f03fc154ca15833ff09ef6f83bba885e19e91a9
+DIST QLivePlayer-3.22.4.tar.gz 640975 BLAKE2B 313d6a68d9ab2914680e3c8f3478659fc8cae4e060f2006c0dba4441796c7880611ad1ca9d2d754bacd5cc542774eefcb0e46807b6dacc20a04c1538bda0394f SHA512 08fc3abb7b923baba09c60c86185431fe3754a1e06978247247e1482100e3b41c2a5185bc5fea1270fd2e7e9d90509880ea4ba4e8bb133cc4745f229c93744d3
diff --git a/media-video/qliveplayer/qliveplayer-3.22.1.ebuild b/media-video/qliveplayer/qliveplayer-3.22.4.ebuild
similarity index 94%
rename from media-video/qliveplayer/qliveplayer-3.22.1.ebuild
rename to media-video/qliveplayer/qliveplayer-3.22.4.ebuild
index ee31e703a0..ecc8b17527 100644
--- a/media-video/qliveplayer/qliveplayer-3.22.1.ebuild
+++ b/media-video/qliveplayer/qliveplayer-3.22.4.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
-inherit xdg cmake optfeature python-single-r1 readme.gentoo-r1
+inherit cmake optfeature python-single-r1 readme.gentoo-r1 xdg
 
 MY_P="QLivePlayer-${PV}"
 
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
index a255941c30..f793b79369 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -4,23 +4,28 @@
 EAPI=7
 
 SSL_DAYS=36500
-inherit git-r3 ssl-cert toolchain-funcs
+inherit ssl-cert toolchain-funcs
 
 DESCRIPTION="Simple and secure Gemini server"
 HOMEPAGE="https://www.omarpolo.com/pages/gmid.html"
-EGIT_REPO_URI="https://github.com/omar-polo/${PN}.git https://git.omarpolo.com/${PN}"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/omar-polo/${PN}.git https://git.omarpolo.com/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="BSD ISC MIT"
 SLOT="0"
 IUSE="+seccomp test"
-RESTRICT="
-	!test? ( test )
-	seccomp? ( test )
-"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	acct-user/gemini
 	dev-libs/imsg-compat
+	dev-libs/libbsd
 	dev-libs/libevent
 	dev-libs/libretls
 "
@@ -44,12 +49,16 @@ src_configure() {
 	)
 
 	./configure "${conf_args[@]}" || die
+
+	if use seccomp && has usersandbox ${FEATURES} ; then
+		export SKIP_RUNTIME_TESTS=1
+	fi
 }
 
 src_compile() {
 	emake gmid
 	if use test ; then
-		emake -C regress gg puny-test testdata iri_test
+		emake -C regress gg data puny-test fcgi-test
 	fi
 }
 
diff --git a/x11-misc/betterlockscreen_rapid/Manifest b/x11-misc/betterlockscreen_rapid/Manifest
index a9b1eb1d33..8ceee8d696 100644
--- a/x11-misc/betterlockscreen_rapid/Manifest
+++ b/x11-misc/betterlockscreen_rapid/Manifest
@@ -1,3 +1,2 @@
-DIST betterlockscreen_rapid-0.0.0_pre20201222.tar.gz 1837065 BLAKE2B 13d119c7e9514778cb65d97e55ec62861e157a4f69d74366de58250511d1f51214f525245bdee3ad7dd2fcffe6fda70f66f1e47576c3c21903b6256a67e0d5e6 SHA512 9b3f7a0783de8083b31950ed0bad73396a904d42f613edd55b4e0f03e465c5c1fae2acda70b8737ec3e1e33ea4534d15725b5f0f96a52f3a9e338032af49b169
-DIST betterlockscreen_rapid-0.0.0_pre20210606.tar.gz 1837081 BLAKE2B 4cd43fb11eedd06254e676df113f653f779d6d2bbe5b244727a6acb7ba25e5293fbfc37c3edfdbea80b984939397e09fbe3370ccda9ecf5c846b49e97bc2ef0d SHA512 c339b2bc98e67062a95d437baad5bd6683ec938e1e37b6b41b895f4e8f48b4d6fcf576b7927c231166239e2b5a454af3297bdf673f0f7249a42106cf9dd236e4
 DIST betterlockscreen_rapid-0.0.0_pre20210701.tar.gz 1837284 BLAKE2B 8d7387517abcc3c2cb35aba4e53509754c8439b2969aa4c19a550d87d9b3bc8653778866fd329dc53229b72eafd4f5cc065514b4baa01fd144926f215a61e4e3 SHA512 7a92dbbc857be2bfb192d589e2709f3ca59dc471a7c73b495362deb5cdcfa36335db86e575a76b044328c67a861b0683e4a7a981d4cab197c9214713b67e5004
+DIST betterlockscreen_rapid-0.0.0_pre20210708.tar.gz 1858671 BLAKE2B 8dc6294742b8b0fc586364c97a90be2d12ce28179f84c8570850ddd6ecaaaa7f6e326c8291f530e9c385158c1d308ea85cafe8274335627bc1034bf804e250fc SHA512 a3038ba132bb3682ef742155fce8b64f8646930a5311bbe6ce6e6bbf38d0cbd6cb76a2c73c9526598a378a958cffcacbb31aa81c40ac6e985feb61f2f0091e00
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
deleted file mode 100644
index cbe82ed7c5..0000000000
--- a/x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-0.0.0_pre20201222.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2021 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 ~arm ~arm64 ~x86"
-
-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-0.0.0_pre20210606.ebuild b/x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-0.0.0_pre20210708.ebuild
similarity index 92%
rename from x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-0.0.0_pre20210606.ebuild
rename to x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-0.0.0_pre20210708.ebuild
index 639fa51e32..fc694a946b 100644
--- a/x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-0.0.0_pre20210606.ebuild
+++ b/x11-misc/betterlockscreen_rapid/betterlockscreen_rapid-0.0.0_pre20210708.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-MY_REV="f3014321f49f7e62dfeb5489e70c0fad8469d13e"
+MY_REV="95dc752f8e41ab37cfcc3a8decb5fcf334e6e7d3"
 
 DESCRIPTION="A rapid and good-looking screen locker"
 HOMEPAGE="https://github.com/oakszyjrnrdy/betterlockscreen_rapid"