diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-21.1.0.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-21.1.0.ebuild
index 7860b9f41f6c..41f8e60ab516 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-21.1.0.ebuild
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-21.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit kodi-addon
+inherit cmake
 
 DESCRIPTION="Kodi PVR addon VNSI"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
@@ -14,10 +14,10 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	KEYWORDS="~amd64 ~x86"
 	CODENAME="Omega"
 	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.vdr.vnsi-${PV}-${CODENAME}"
+	KEYWORDS="~amd64 ~x86"
 	;;
 esac
 
@@ -25,10 +25,14 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="
-	=media-tv/kodi-21*
+	=media-tv/kodi-${PV%%.*}*
 	virtual/opengl
 "
+RDEPEND="${DEPEND}"
 
-RDEPEND="
-	${DEPEND}
-"
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)/kodi"
+	)
+	cmake_src_configure
+}
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
index 16255af9db8c..a809165179e4 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake kodi-addon
+inherit cmake
 
 DESCRIPTION="Kodi PVR addon VNSI"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
-SRC_URI=""
 
 case ${PV} in
 9999)
-	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi.git"
 	inherit git-r3
 	;;
 *)
-	KEYWORDS="~amd64 ~x86"
 	CODENAME="Matrix"
 	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.vdr.vnsi-${PV}-${CODENAME}"
+	KEYWORDS="~amd64 ~x86"
 	;;
 esac
 
@@ -28,10 +26,14 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	~media-tv/kodi-9999
+	=media-tv/kodi-${PV%%.*}*
 	virtual/opengl
-	"
+"
+RDEPEND="${DEPEND}"
 
-RDEPEND="
-	${DEPEND}
-	"
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)/kodi"
+	)
+	cmake_src_configure
+}