diff --git a/app-crypt/reop/reop-2.1.1.ebuild b/app-crypt/reop/reop-2.1.1.ebuild
index 848357b7e6..439cf435b6 100644
--- a/app-crypt/reop/reop-2.1.1.ebuild
+++ b/app-crypt/reop/reop-2.1.1.ebuild
@@ -15,7 +15,7 @@ DEPEND="dev-libs/libsodium:="
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	emake CC="${CC:-cc}" CFLAGS="${CFLAGS}"
+	emake CC="${CC:-cc}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -lsodium"
 }
 
 src_test() {
diff --git a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild
index fd7b2a26cc..85318fa2b2 100644
--- a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild
+++ b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild
@@ -44,7 +44,10 @@ RDEPEND="dev-libs/xerces-c
 	archive? (
 		dev-libs/libpcre2
 		app-arch/libarchive )
-	python? ( $(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]') )"
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]')
+	)"
 
 DEPEND="${RDEPEND}"
 
diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild
index fd7b2a26cc..85318fa2b2 100644
--- a/app-misc/far2l/far2l-9999.ebuild
+++ b/app-misc/far2l/far2l-9999.ebuild
@@ -44,7 +44,10 @@ RDEPEND="dev-libs/xerces-c
 	archive? (
 		dev-libs/libpcre2
 		app-arch/libarchive )
-	python? ( $(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]') )"
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]')
+	)"
 
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/mtxclient/Manifest b/dev-libs/mtxclient/Manifest
index 8d47a37c37..1baa03481c 100644
--- a/dev-libs/mtxclient/Manifest
+++ b/dev-libs/mtxclient/Manifest
@@ -1,3 +1,2 @@
 DIST mtxclient-0.4.1.tar.gz 572552 BLAKE2B 4d0facaffb0ce1fadc1011b7d557774bcd9ffcef7349894255b9522bcc4e9228739ad8da5a60b0addf6835cf5de3613bebc19842b6922ab9cf94f88c944d0091 SHA512 246c84bc8bc7dd6fd688c79601d16e931b5aaf5fe967d6ea226f1961df2b74ad70d4e790b7400051e007506f58ecd6594ccead31bd3c6308aa2c6727b122c203
-DIST mtxclient-0.5.0.tar.gz 582236 BLAKE2B 5166c32127973e886adadb6ad8a2895ba5ac77f78e9a774f039b0c8d4329078c0b8de965b477ce1c3a7e4cd929de8ba9b8d4f8d8b0452f6c49c873285a4d8b3a SHA512 6e1e9f5ecb1e6911b5bee85569e4477f6ee4c86ef479a3f408c8bbd187750b3b78db1db0337b51e1df9b90fee3b486eaf909bb79b69a97919685074eee3a82cd
 DIST mtxclient-0.5.1.tar.gz 582367 BLAKE2B d30a5e0e16d6783d8d1175e5f4144d845fe62897dcc7952cb1598470befa1da47a2b06cd70a60f511a1c2e7656eca2cf5a87734cbc61b79d2a05df295fd256e0 SHA512 f0a5e823bd7f3cccdf5f919c04c36a1a5ab4d2627a6f8f3fac78e4b300eda3b9e1f5060fb31e6e47267bbafc3a03f6c2a2d16c2323e63ce4889f551860e7703f
diff --git a/dev-libs/mtxclient/mtxclient-0.5.0.ebuild b/dev-libs/mtxclient/mtxclient-0.5.0.ebuild
deleted file mode 100644
index 43315c94dc..0000000000
--- a/dev-libs/mtxclient/mtxclient-0.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio"
-HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
-SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/boost-1.70.0
-	dev-libs/olm
-	>=dev-libs/openssl-1.1.0
-	dev-cpp/nlohmann_json
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/spdlog
-	test? ( dev-cpp/gtest )
-"
-
-# remove_failing_tests depends on remove_network_tests.
-PATCHES=(
-	"${FILESDIR}/0.3.0_remove_network_tests.patch"
-	"${FILESDIR}/0.3.0_remove_failing_tests.patch"
-)
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DBUILD_LIB_TESTS="$(usex test)"
-		-DBUILD_LIB_EXAMPLES=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/gui-apps/wlsunset/Manifest b/gui-apps/wlsunset/Manifest
new file mode 100644
index 0000000000..fccf175042
--- /dev/null
+++ b/gui-apps/wlsunset/Manifest
@@ -0,0 +1 @@
+DIST wlsunset-0.1.0.tar.gz 10927 BLAKE2B 73080cc671885b7be00bcfe5227f6a2616b673eeb1435fbcf7ea0d23ba368b9a7bf9f3cdd9d9f4a8e6a6149fa5686ef624d2aaea61765ad76c65fc1737dfe629 SHA512 5e94469ab5cd810563e0171cd26547fba3d8152eebb4f81c1b7b0f9d8484faa214bc3ab2142749be47d2c1028d8ab6913a80770135801622327f9bc813138b0b
diff --git a/gui-apps/wlsunset/metadata.xml b/gui-apps/wlsunset/metadata.xml
new file mode 100644
index 0000000000..c698af2344
--- /dev/null
+++ b/gui-apps/wlsunset/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>contact@hacktivis.me</email>
+		<name>Haelwenn (lanodan) Monnier</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gui-apps/wlsunset/wlsunset-0.1.0.ebuild b/gui-apps/wlsunset/wlsunset-0.1.0.ebuild
new file mode 100644
index 0000000000..9aacf68831
--- /dev/null
+++ b/gui-apps/wlsunset/wlsunset-0.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/wlsunset"
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://git.sr.ht/~kennylevinsen/wlsunset/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Day/night gamma adjustments for Wayland"
+HOMEPAGE="https://sr.ht/~kennylevinsen/wlsunset/"
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="
+	dev-util/wayland-scanner
+	dev-libs/wayland-protocols
+	app-text/scdoc
+"
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Dwerror=false
+		-Dman-pages=enabled
+	)
+
+	meson_src_configure
+}
diff --git a/gui-apps/wlsunset/wlsunset-9999.ebuild b/gui-apps/wlsunset/wlsunset-9999.ebuild
new file mode 100644
index 0000000000..9aacf68831
--- /dev/null
+++ b/gui-apps/wlsunset/wlsunset-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/wlsunset"
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://git.sr.ht/~kennylevinsen/wlsunset/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Day/night gamma adjustments for Wayland"
+HOMEPAGE="https://sr.ht/~kennylevinsen/wlsunset/"
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="
+	dev-util/wayland-scanner
+	dev-libs/wayland-protocols
+	app-text/scdoc
+"
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Dwerror=false
+		-Dman-pages=enabled
+	)
+
+	meson_src_configure
+}
diff --git a/media-fonts/unscii/Manifest b/media-fonts/unscii/Manifest
index 24d1cfd6cb..91bd96aef4 100644
--- a/media-fonts/unscii/Manifest
+++ b/media-fonts/unscii/Manifest
@@ -1,2 +1 @@
-DIST unscii-2.0-src.tar.gz 1672906 BLAKE2B c565b09333c10fafe1d4e75124ae8346119f772b72073cc65ba7c78979693a56e6a6535634897866b138747149b68b1a59469d2f98ba87dd0e62da5630ee1314 SHA512 f13cdf2fe32bb12ccc1cf2e1789b2dfb4c459ad85ca294736707c57a6acf47db187b1921fd9ce1e7df7e1d6a4a6b0613bd7cb78ff51c64b36ca6f9d43198ace7
 DIST unscii-2.1.tar.gz 1277989 BLAKE2B 0f82290c2c36fb60fadfb07032775feb13469259c1ff57f2d34c2d28384f629ce48c9b1a069391e25fbc493fafe160db913c61b58d280f96ea4c3f147a0b7550 SHA512 bbcfa17b57a15d5710407507487bc33e76448b0a8b5b65d08f9a598153137933403da9183de05183a4e897a84b409c602bf751e8f6cfe141a6d63c3d310f893a
diff --git a/media-fonts/unscii/unscii-2.0.ebuild b/media-fonts/unscii/unscii-2.0.ebuild
deleted file mode 100644
index 47008c3529..0000000000
--- a/media-fonts/unscii/unscii-2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_SUFFIX="otf pcf ttf"
-inherit toolchain-funcs font
-
-DESCRIPTION="Set of bitmapped Unicode fonts based on classic system fonts"
-HOMEPAGE="http://viznut.fi/unscii/"
-SRC_URI="http://viznut.fi/unscii/${P}-src.tar.gz"
-
-LICENSE="
-	public-domain
-	unicode? ( GPL-2 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="unicode"
-
-RDEPEND="media-libs/sdl-image"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	media-gfx/fontforge
-	x11-apps/bdftopcf
-	unicode? ( media-fonts/unifont[utils] )
-"
-S="${WORKDIR}/${P}-src"
-DOCS=( ${PN}.txt )
-
-src_install() {
-	font_src_install
-	dobin bm2uns
-}
diff --git a/media-fonts/unscii/unscii-2.1.ebuild b/media-fonts/unscii/unscii-2.1.ebuild
index 6e0064d4bc..01e7be3afa 100644
--- a/media-fonts/unscii/unscii-2.1.ebuild
+++ b/media-fonts/unscii/unscii-2.1.ebuild
@@ -33,7 +33,12 @@ DOCS=( ${PN}.txt )
 
 src_prepare() {
 	default
-	sed -i "s/gcc.*/$(tc-getCC) ${CFLAGS}/" Makefile || die
+
+	sed -i \
+		-e 's;CC=.*;CC ?= gcc;' \
+		-e 's;$(CC) ;&$(CFLAGS) ;' \
+		-e 's;$(CC) .* -o .*;& $(LDFLAGS);' \
+		Makefile || die
 }
 
 src_install() {
diff --git a/media-plugins/alsa-sndio/alsa-sndio-0.2.ebuild b/media-plugins/alsa-sndio/alsa-sndio-0.2.ebuild
index 23a00cde33..203199067e 100644
--- a/media-plugins/alsa-sndio/alsa-sndio-0.2.ebuild
+++ b/media-plugins/alsa-sndio/alsa-sndio-0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DESCRIPTION="Sndio audio sink and source for GStreamer"
+DESCRIPTION="ALSA PCM to play audio on sndio servers"
 HOMEPAGE="https://github.com/Duncaen/alsa-sndio"
 SRC_URI="https://github.com/Duncaen/alsa-sndio/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ISC"
@@ -22,6 +22,10 @@ src_prepare() {
 	sed -i "s;/lib/alsa-lib/;/$(get_libdir)/alsa-lib/;" Makefile || die "Failed changing libdir"
 }
 
+src_compile() {
+	emake CC="${CC:-gcc}"
+}
+
 src_install() {
 	export PREFIX="/usr"
 
diff --git a/net-im/nheko/Manifest b/net-im/nheko/Manifest
index 2f9709fefc..b4ca85359c 100644
--- a/net-im/nheko/Manifest
+++ b/net-im/nheko/Manifest
@@ -1,2 +1,2 @@
-DIST nheko-0.8.0.tar.gz 1150754 BLAKE2B ef932f824a2e519514836aa1362504b11c4c9f511e8e66889008891cf5ac008442629afc56deb221dfaebda42c91c9c145f5e489733fee95838e100b4d4c5b77 SHA512 c427904bc846956aeda57ec6bc1bcf25962caa99f47da669c006d5adeb10b8b14c75aa98d9879fa91b558af8d0e9b475f52c60a1a3ee34b2cd5780f84130bcdb
 DIST nheko-0.8.1.tar.gz 1176445 BLAKE2B 5ef1523b23b1512d56cd6109f05ec3f710629a561ddf8e766d8f3f3a2d3bdd65d6a83da381f3e53bfbd1ee470243dae8ff488880973dadc166cc82e52d03abbe SHA512 180c876121338ea6d45e85d11a3cfd1f988a084a650becacfa5a9cbb4a556a0f47625194e3d9870bb6692b15d16c5ac75999e241f08a2828ec471b3d64c1eb62
+DIST nheko-0.8.2.tar.gz 1232245 BLAKE2B cb7397a2247c280cac23efe4a5983e43ebe9a6cacbadfdb3798b856633bd9e9c1ac1c56750373817373691d5d3624aec815040743d44c60dcb900f8616498d8f SHA512 907b5fd770c2e451ee4d5a4483810cf87529f643d584784b2f3c471b54229243842313206bbd38c8b6ca9a91bf505b683d6741bdce8ea24407ae4178da579465
diff --git a/net-im/nheko/nheko-0.8.0.ebuild b/net-im/nheko/nheko-0.8.2.ebuild
similarity index 95%
rename from net-im/nheko/nheko-0.8.0.ebuild
rename to net-im/nheko/nheko-0.8.2.ebuild
index e89aaaa6d7..462407d6a1 100644
--- a/net-im/nheko/nheko-0.8.0.ebuild
+++ b/net-im/nheko/nheko-0.8.2.ebuild
@@ -21,15 +21,14 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtconcurrent:5
 	app-text/cmark
-	<dev-libs/mtxclient-0.5.0
+	>=dev-libs/mtxclient-0.5.1
 	dev-cpp/nlohmann_json
 	dev-libs/qtkeychain
 "
 DEPEND="
 	${RDEPEND}
 	dev-libs/spdlog
-	dev-libs/tweeny
-	<dev-db/lmdb++-1.0.0
+	>=dev-db/lmdb++-1.0.0
 "
 BDEPEND="dev-qt/linguist-tools:5"
 
diff --git a/net-libs/usockets/usockets-0.7.1_p20210214.ebuild b/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
index 499d8f975c..e601304dbb 100644
--- a/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
+++ b/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
@@ -33,7 +33,7 @@ PATCHES=(
 )
 
 src_configure() {
-	tc-export CC CXX
+	tc-export CC CXX AR
 	export VERSION="${PV%_*}" \
 	       LIB="$(get_libdir)" \
 	       WITH_OPENSSL="$(usex ssl 1 0)"
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 10ce0fdd32..18e9a52555 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 )
 
 src_configure() {
-	tc-export CC CXX
+	tc-export CC CXX AR
 	export VERSION="${PV%_*}" \
 	       LIB="$(get_libdir)" \
 	       WITH_OPENSSL="$(usex ssl 1 0)"
diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
index b697c8266d..3c80b682b9 100644
--- a/net-misc/tinyssh/Manifest
+++ b/net-misc/tinyssh/Manifest
@@ -1 +1 @@
-DIST tinyssh-20190101.tar.gz 244848 BLAKE2B a115bca82db020970a1cd8dd27f65f0d586f291fdcbcd786802babaa82befddd39ec8651dd4d6ebc3503e8c4e5903a335a6b14dc2957bae5519e4a7dee6fd495 SHA512 bf3829a71c29e8b0d5c2a145be9dfaf05efb1b98932f34f19f76e07871da4be10022bdde4c57ca49557b69931077b451bc2efbeab38d8ef24151fb73990f1012
+DIST tinyssh-20210319.tar.gz 245451 BLAKE2B fdbb41281edde704d660de07b9a01b48aa1fd17c596b1e7ecbe46ccc804f3499036845781c736c39d99911bcdc6aefc2b1fe354ea40972dbff55a24121629a1f SHA512 e839355fdae241ff90a2cbc95219141a2e12b2efaeb8631f2a1f7400868d93998843da5170146b13de6e10d5098acfea0ef55a0154c5fe22a093f67d4fa7ce0e
diff --git a/net-misc/tinyssh/tinyssh-20190101.ebuild b/net-misc/tinyssh/tinyssh-20210319.ebuild
similarity index 84%
rename from net-misc/tinyssh/tinyssh-20190101.ebuild
rename to net-misc/tinyssh/tinyssh-20210319.ebuild
index 1ad54dd705..1fccc0e226 100644
--- a/net-misc/tinyssh/tinyssh-20190101.ebuild
+++ b/net-misc/tinyssh/tinyssh-20210319.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
@@ -29,7 +29,7 @@ src_prepare() {
 
 	# Use make-tinysshcc.sh script, which has no tests and doesn't execute
 	# binaries. See https://github.com/janmojzis/tinyssh/issues/2
-	sed -i 's/tinyssh/tinysshcc/g' ./Makefile || die
+	sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die
 
 	default
 }
@@ -38,11 +38,12 @@ src_compile() {
 	if use sodium
 	then
 		emake \
+			CC="$(tc-getCC)"
 			LIBS="-lsodium" \
-			CFLAGS="$CFLAGS -I/usr/include/sodium" \
-			LDFLAGS="-L/usr/lib"
+			CFLAGS="${CFLAGS} -I/usr/include/sodium" \
+			LDFLAGS="${LDFLAGS} -L/usr/lib"
 	else
-		emake
+		emake CC="$(tc-getCC)"
 	fi
 }
 
diff --git a/www-servers/hinsightd/hinsightd-0.9.0.ebuild b/www-servers/hinsightd/hinsightd-0.9.0.ebuild
index 7f95594b60..b81f198f9d 100644
--- a/www-servers/hinsightd/hinsightd-0.9.0.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-1 )
 
-inherit fcaps lua-single
+inherit fcaps lua-single systemd
 
 DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
 HOMEPAGE="https://gitlab.com/tiotags/hin9"
diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild
index cfc31c90f6..8ae886a394 100644
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} )
 
-inherit git-r3 fcaps lua-single
+inherit git-r3 fcaps lua-single systemd
 
 DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
 HOMEPAGE="https://gitlab.com/tiotags/hin9"
diff --git a/x11-misc/gromit-mpx/Manifest b/x11-misc/gromit-mpx/Manifest
index 5e5569d509..0fc8169508 100644
--- a/x11-misc/gromit-mpx/Manifest
+++ b/x11-misc/gromit-mpx/Manifest
@@ -1,2 +1 @@
-DIST gromit-mpx-1.3.1.tar.gz 60834 BLAKE2B 0290b3d538471c519392412c1b11826f738d55b0761d9118629cd1b9b8fec1bd6d9a72693356decd47d829befdcddf1f4c55925fafb54cb32782f2601d4b0829 SHA512 dc57c8d97717a64fbfcf48c231f47149134d1fd5cdeb0db22efd367ac416096e6923b8f932a113fc8bd175dc3e7ebfe633acac22a7e778a87a2d912bdebf3532
 DIST gromit-mpx-1.4.tar.gz 1858578 BLAKE2B e7f8cd9f424422f7169b14f9780c64c317fecc9de421e6960f1926629423ddf1e9ac796b806d36cae884dd074e352cfca6084b9821cc74cdcabfbecf3d611c9c SHA512 5a2b81dcaef9b04e9d514c966b0b96dcb1b6b4a4cba1f26056ac3b758922d82e551397cf9c06a32a395e6a5b99a3d8c08fdd5ac875fdf7455efc2abe7eeb82f5
diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.3.1.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.3.1.ebuild
deleted file mode 100644
index 7ed81fd664..0000000000
--- a/x11-misc/gromit-mpx/gromit-mpx-1.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool"
-HOMEPAGE="https://github.com/bk138/gromit-mpx"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bk138/${PN}.git"
-else
-	SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	dev-libs/libappindicator:3
-	x11-libs/libX11
-	>=x11-apps/xinput-1.3
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
-	)
-
-	cmake_src_configure
-}
diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.4.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.4.ebuild
index 7ed81fd664..60db7a22ee 100644
--- a/x11-misc/gromit-mpx/gromit-mpx-1.4.ebuild
+++ b/x11-misc/gromit-mpx/gromit-mpx-1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake xdg
 
 DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool"
 HOMEPAGE="https://github.com/bk138/gromit-mpx"
@@ -27,6 +27,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+src_prepare () {
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
diff --git a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild
index 7ed81fd664..60db7a22ee 100644
--- a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild
+++ b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake xdg
 
 DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool"
 HOMEPAGE="https://github.com/bk138/gromit-mpx"
@@ -27,6 +27,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+src_prepare () {
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc