diff --git a/media-gfx/koko/Manifest b/media-gfx/koko/Manifest
index 71ab0c8..64fcc0b 100644
--- a/media-gfx/koko/Manifest
+++ b/media-gfx/koko/Manifest
@@ -1,3 +1,3 @@
-DIST koko-9999-admin1CodesASCII.txt 136891 BLAKE2B 030d0d3d5ea4dd5473b46d1f2de0b8b42b53e84894c3e29867f4316723e5d3aec1ea90573f06de65d2d94205603d5b1c601eda66d5ff3e384e1a5c5e4a5efbdd SHA512 25b4fccff7833037ceedeb268d92bac6a4f2df225837ce6095a8bfe486979765cda550d04e3ca5791e7689c7f6dbb5199b8962962c802c876e6fe27e16e4e422
-DIST koko-9999-admin2Codes.txt 2226955 BLAKE2B 41993590aafbee42ecc0f6693088a7a9c55e55ddbf1b391468a05247ae1534a8f3aea6831a750e6168229658abd0fec50f99bfe7e3010b26ca4fc7122d71049b SHA512 7f88c5c02259519441cc421eed732b841c200b76d59d7e2c048b0472fd7f500e2254b5b23f8112cd560028f5bfb9b6ce458b966fac781c94ca27513400afac0b
-DIST koko-9999-cities1000.zip 8009547 BLAKE2B 6dae934a8939b49bd9de4ff638dddd305cd9908e4812b76f2a764504a48e0e8bc359eced1b6e477c6772f643e9a46d6a6aa06dcb121c8a6a34681f38da94deca SHA512 fca4dab5b08994c255070544a1d28075de3a0fa153a13adda0519798059f932955b896a15d86cfe3d24e079c869597e8354b7b8ad88a20e781072d8adc3202c7
+DIST koko-9999-admin1CodesASCII.txt 140325 BLAKE2B 5f2e0bbf988107b051e2704c87a0e6575f2c509c7794d04964da3bc49638707d265f36fca4cfbd955b5fb575c37f2e4364f9816698d3534a8fb92b3d29da3810 SHA512 9db0bcef193d3912d74aed573e96df1385ab23502b7c44d40b6af1211c2837bdc0510bc2e7e69080b9eafab411df6cdea89a02d04336f46a56436464192fb563
+DIST koko-9999-admin2Codes.txt 2261531 BLAKE2B 07a3ed6a0ba8984a4701e412b79af97b26ccb52000f377b9140fe7a3354f64491468f4ce964bcfbbb6c005f464679f9130b70bac0ee619026e898215e51e5e33 SHA512 a197067d947d9846b0ed416798af4f7f80c4f682acffe00879659419062162e05d0d476e61a013eda95ed34d188a887dd6da7cb8ab57fc2d8ff6e292c6eec313
+DIST koko-9999-cities1000.zip 8443789 BLAKE2B e537d11e7eefe205d3fcbb6342af3ecd2ece0fd16cb955c1565ed986a3f7e583929158b86a1222e26b63787434739798a3599235ede834f6f13fb92ef689755a SHA512 23ce59684216e3494c05dae144281ccdb2620a1763e1744dd69816bfef3c1b4c318615edc34ac80d7c3e1ddbe2dcd22578e369cbccf5313f97736e51e2333460
diff --git a/media-gfx/koko/koko-9999.ebuild b/media-gfx/koko/koko-9999.ebuild
index a5d882f..8b5bcc9 100644
--- a/media-gfx/koko/koko-9999.ebuild
+++ b/media-gfx/koko/koko-9999.ebuild
@@ -1,64 +1,80 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake xdg
+ECM_HANDBOOK="true"
+ECM_TEST="true"
+KFMIN=5.240
+QTMIN=6.4
+
+GEONAMES_DATA=(
+	"admin1CodesASCII.txt"
+	"admin2Codes.txt"
+	"cities1000.zip"
+)
+
+geonames-src_uri() {
+	for file in ${GEONAMES_DATA[@]}; do
+		SRC_URI+=" https://download.geonames.org/export/dump/${file} -> ${P}-${file}"
+	done
+}
+
+inherit ecm gear.kde.org git-r3
 
 DESCRIPTION="Image gallery application by KDE designed for desktop and touch devices"
-HOMEPAGE="https://invent.kde.org/graphics/koko"
+HOMEPAGE="https://apps.kde.org/koko/"
 
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://invent.kde.org/graphics/${PN}.git"
-else
-	SRC_URI=""
-	KEYWORDS="~amd64"
-fi
-SRC_URI="
-	${SRC_URI}
-	http://download.geonames.org/export/dump/cities1000.zip -> ${P}-cities1000.zip
-	http://download.geonames.org/export/dump/admin1CodesASCII.txt -> ${P}-admin1CodesASCII.txt
-	http://download.geonames.org/export/dump/admin2Codes.txt -> ${P}-admin2Codes.txt
-"
-
-# Cmake tests
-RESTRICT="
-	mirror
-	!test? ( test )
-"
-LICENSE="LGPL-3"
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) CC-BY-4.0"
 SLOT="0"
-IUSE="test"
+IUSE="X"
 
+geonames-src_uri
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtpositioning-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/kfilemetadata-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=media-gfx/exiv2-0.21:=
+	>=media-libs/kquickimageeditor-1.0
+	X? ( x11-libs/libxcb:= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-libs/kirigami-addons:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/purpose-${KFMIN}:6
+"
 BDEPEND="
 	app-arch/unzip
 "
-RDEPEND="
-	kde-frameworks/purpose:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/qtpositioning:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	test? (
-		dev-qt/qttest
-	)
-"
 
-src_prepare() {
-	cmake_src_prepare
+CMAKE_SKIP_TESTS=(
+	# Expects files to installed, and you can't install the files before you test.
+	"reversegeocodertest"
+)
 
-	local dump_files="
-		cities1000.zip
-		admin1CodesASCII.txt
-		admin2Codes.txt
-	"
-	for f in ${dump_files}
-	do
-		echo "Copying: ${f}"
-		cp "${DISTDIR}"/"${P}-${f}" "${S}"/src/"${f}" || die "Failed to copy: ${f}"
+src_unpack() {
+	git-r3_src_unpack
+
+	for file in ${GEONAMES_DATA[@]}; do
+		cp "${DISTDIR}/${P}-${file}" "${S}/src/${file}" || die
 	done
 }
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X XCB)
+	)
+	cmake_src_configure
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 1069912..fd7ec3a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,3 +1,7 @@
+# Alfred Wingate <parona@protonmail.com> (2024-01-21)
+# Requires dependencies which are in still in staging in the kde overlay.
+media-gfx/koko
+
 # Alfred Wingate <parona@protonmail.com> (2023-11-23)
 # Gtk applications that are broken at runtime, most likely due to
 # lack maintenance to work with updated dependencies (libsoup:3 et al).