diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest
index 10a70d863a..8df7a50a7f 100644
--- a/net-im/abaddon/Manifest
+++ b/net-im/abaddon/Manifest
@@ -1 +1,2 @@
 DIST abaddon-0.2.1.tar.gz 14187672 BLAKE2B 80adeeda5aa6244676cba1247eb5d4e43e1b6a31130ee902146af62a4b824fbaa0711a1014b626bdb3c70210cdca7b2a1fd598e443fcde3369bec47dfd1675cd SHA512 d3d94ffcf361fcbee787de85bca2901feddcd24c543d80969cacaa2e28ad5c6548beee335ff1c394994618a05f22e6ee7114e8ef26355c65fb0315a58c5b775a
+DIST abaddon-0.2.2.tar.gz 14502623 BLAKE2B c88d5c255dd9e72a54537337727390f14d4fe212da3d6882cb3ec09df6b1f0a822c0f956ceb6cffba291ee858dfbd5a0185499cbe7609b4c2131f4198840b386 SHA512 32f5d40f1695954b7e6f77ddd2d5fa78ee643f86ea1a0d590fc77b6af6f85d0148c69214dd4efc2418fae94bdc20846be906d52d0a6d6bb81902edf35a192343
diff --git a/net-im/abaddon/abaddon-0.2.2.ebuild b/net-im/abaddon/abaddon-0.2.2.ebuild
new file mode 100644
index 0000000000..2960ab5496
--- /dev/null
+++ b/net-im/abaddon/abaddon-0.2.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop
+
+DESCRIPTION="Alternative Discord client using GTK instead of Electron"
+HOMEPAGE="https://github.com/uowuo/abaddon"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/uowuo/abaddon.git"
+	# All dependencies are provided by portage
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+libhandy +rnnoise qrcodegen"
+
+RDEPEND="
+	dev-cpp/atkmm
+	dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-cpp/pangomm:1.4
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libfmt:=
+	dev-libs/libsigc++:2
+	dev-libs/libsodium:=
+	dev-libs/spdlog:=
+	media-libs/opus
+	>=net-libs/ixwebsocket-11.0.8:=
+	net-misc/curl
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+	libhandy? ( gui-libs/libhandy:1 )
+	qrcodegen? ( dev-libs/qr-code-generator )
+	rnnoise? ( media-libs/rnnoise )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-libs/miniaudio
+"
+
+src_configure() {
+	# Disable keychain because there's currently
+	# no package for it in ::guru or ::gentoo
+	local mycmakeargs=(
+		-DUSE_LIBHANDY="$(usex libhandy)"
+		-DENABLE_RNNOISE="$(usex rnnoise)"
+		-DUSE_KEYCHAIN="no"
+		-DENABLE_QRCODE_LOGIN="$(usex qrcodegen)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	make_desktop_entry /usr/bin/${PN}
+}
diff --git a/net-im/abaddon/abaddon-9999.ebuild b/net-im/abaddon/abaddon-9999.ebuild
index 2671554307..2960ab5496 100644
--- a/net-im/abaddon/abaddon-9999.ebuild
+++ b/net-im/abaddon/abaddon-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,22 +23,30 @@ SLOT="0"
 IUSE="+libhandy +rnnoise qrcodegen"
 
 RDEPEND="
-	dev-cpp/gtkmm:3.0=
+	dev-cpp/atkmm
+	dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-cpp/pangomm:1.4
 	dev-db/sqlite:3
-	dev-libs/libsodium
-	dev-libs/miniaudio
-	dev-libs/spdlog
+	dev-libs/glib:2
+	dev-libs/libfmt:=
+	dev-libs/libsigc++:2
+	dev-libs/libsodium:=
+	dev-libs/spdlog:=
 	media-libs/opus
-	>=net-libs/ixwebsocket-11.0.8
+	>=net-libs/ixwebsocket-11.0.8:=
 	net-misc/curl
 	sys-libs/zlib:=
-	libhandy? ( gui-libs/libhandy:= )
+	x11-libs/gtk+:3
+	libhandy? ( gui-libs/libhandy:1 )
 	qrcodegen? ( dev-libs/qr-code-generator )
 	rnnoise? ( media-libs/rnnoise )
 "
 DEPEND="
 	${RDEPEND}
 	dev-cpp/nlohmann_json
+	dev-libs/miniaudio
 "
 
 src_configure() {
@@ -54,10 +62,6 @@ src_configure() {
 }
 
 src_install() {
-	dobin "${BUILD_DIR}"/abaddon
-
-	insinto /usr/share/${PN}
-	doins -r res/*
-
+	cmake_src_install
 	make_desktop_entry /usr/bin/${PN}
 }