diff --git a/app-misc/catt/catt-0.12.12-r1.ebuild b/app-misc/catt/catt-0.12.12-r1.ebuild
new file mode 100644
index 0000000000..fa2c66c848
--- /dev/null
+++ b/app-misc/catt/catt-0.12.12-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=poetry
+inherit distutils-r1
+
+DESCRIPTION="Send videos from many, many online sources to your Chromecast"
+HOMEPAGE="https://github.com/skorokithakis/catt"
+SRC_URI="https://github.com/skorokithakis/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Seems that all tests makes external connections
+RESTRICT="test"
+
+DEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	<dev-python/pychromecast-14.0.0[${PYTHON_USEDEP}]
+	dev-python/ifaddr[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	net-misc/yt-dlp[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${DEPEND}"
+
+#distutils_enable_tests pytest
diff --git a/media-gfx/nsxiv/Manifest b/media-gfx/nsxiv/Manifest
index bb50055e22..db5131c4d4 100644
--- a/media-gfx/nsxiv/Manifest
+++ b/media-gfx/nsxiv/Manifest
@@ -1 +1,2 @@
 DIST nsxiv-32.tar.gz 74345 BLAKE2B 92257a95095291068c982d91ed32a0ae358f89048057fa6f1cb356caccbba9cb1f9fdb6ca0e16faf4e6e411af942858182cf2bea3b5d19904f3ca686f7b372ed SHA512 e53de494f104440c87eb55606c322cb7ac9989176547131f59e02eb091d04a3a2de6c11c1c775cb25302ff1da5997bc499d753a822c1de4652aa77bf2858fa9a
+DIST nsxiv-f7d1efe3495949e2e88fdfef37aed5a40400acea.comp.zsh 2413 BLAKE2B 0749b55bd9f7d48922d6ac673c1d65e7625bb53c4df524123c9a579edf8aa8c3fba15f4382b5102e812acddaf99d3ec24797703340edd013758ae51a0944758f SHA512 e26af7bdfce2bd1aa1b3d31fee88370b58fbc624c8855d70133ba96a94713e7bdfbfbe6ead650822dbba0f04a5c2ab6cd9dd35a94d46a2455f3a5051554c43f2
diff --git a/media-gfx/nsxiv/nsxiv-32.ebuild b/media-gfx/nsxiv/nsxiv-32.ebuild
index 0068bee5ba..291f4dd130 100644
--- a/media-gfx/nsxiv/nsxiv-32.ebuild
+++ b/media-gfx/nsxiv/nsxiv-32.ebuild
@@ -3,13 +3,20 @@
 
 EAPI=8
 
-inherit desktop xdg-utils savedconfig toolchain-funcs linux-info
+inherit desktop xdg-utils savedconfig toolchain-funcs linux-info shell-completion
 
+ZSH_COMP_COMMIT="f7d1efe3495949e2e88fdfef37aed5a40400acea"
+ZSH_COMP_URI="https://codeberg.org/nsxiv/nsxiv-extra/raw/commit/${ZSH_COMP_COMMIT}/completion/zsh/_nsxiv"
+ZSH_COMP="${PN}-${ZSH_COMP_COMMIT}.comp.zsh"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://codeberg.org/nsxiv/nsxiv.git"
+	SRC_URI="${ZSH_COMP_URI} -> ${ZSH_COMP}"
 	inherit git-r3
 else
-	SRC_URI="https://codeberg.org/nsxiv/nsxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://codeberg.org/nsxiv/nsxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		${ZSH_COMP_URI} -> ${ZSH_COMP}
+	"
 	KEYWORDS="~amd64"
 fi
 
@@ -65,6 +72,7 @@ src_install() {
 		install install-icon
 	dodoc README.md
 	domenu etc/nsxiv.desktop
+	newzshcomp "${DISTDIR}/${ZSH_COMP}" _nsxiv
 
 	save_config config.h
 }
diff --git a/media-gfx/nsxiv/nsxiv-9999.ebuild b/media-gfx/nsxiv/nsxiv-9999.ebuild
index 0068bee5ba..291f4dd130 100644
--- a/media-gfx/nsxiv/nsxiv-9999.ebuild
+++ b/media-gfx/nsxiv/nsxiv-9999.ebuild
@@ -3,13 +3,20 @@
 
 EAPI=8
 
-inherit desktop xdg-utils savedconfig toolchain-funcs linux-info
+inherit desktop xdg-utils savedconfig toolchain-funcs linux-info shell-completion
 
+ZSH_COMP_COMMIT="f7d1efe3495949e2e88fdfef37aed5a40400acea"
+ZSH_COMP_URI="https://codeberg.org/nsxiv/nsxiv-extra/raw/commit/${ZSH_COMP_COMMIT}/completion/zsh/_nsxiv"
+ZSH_COMP="${PN}-${ZSH_COMP_COMMIT}.comp.zsh"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://codeberg.org/nsxiv/nsxiv.git"
+	SRC_URI="${ZSH_COMP_URI} -> ${ZSH_COMP}"
 	inherit git-r3
 else
-	SRC_URI="https://codeberg.org/nsxiv/nsxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://codeberg.org/nsxiv/nsxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		${ZSH_COMP_URI} -> ${ZSH_COMP}
+	"
 	KEYWORDS="~amd64"
 fi
 
@@ -65,6 +72,7 @@ src_install() {
 		install install-icon
 	dodoc README.md
 	domenu etc/nsxiv.desktop
+	newzshcomp "${DISTDIR}/${ZSH_COMP}" _nsxiv
 
 	save_config config.h
 }