diff --git a/dev-python/IP2Location/IP2Location-8.6.4.ebuild b/dev-python/IP2Location/IP2Location-8.6.4.ebuild
deleted file mode 100644
index bd3f64585..000000000
--- a/dev-python/IP2Location/IP2Location-8.6.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for IP2Location database"
-HOMEPAGE="https://pypi.org/project/IP2Location/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HASH_COMMIT="71828f8506cab07f8379faa815fc257ad9d8ca7a"
-SRC_URI="https://github.com/chrislim2888/IP2Location-Python/archive/refs/tags/${PV}.tar.gz  -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/IP2Location-Python-${PV}"
diff --git a/dev-python/apkid/Manifest b/dev-python/apkid/Manifest
index da4d30d2f..697a8f96d 100644
--- a/dev-python/apkid/Manifest
+++ b/dev-python/apkid/Manifest
@@ -1,3 +1,3 @@
-DIST apkid-2.1.2.tar.gz 55588 BLAKE2B 5db03e23d24ffba141609ec2ef2f9215784b7446606addb819829625afbe91e338aadf23d1977e13d891d8d20111bb827d8909074d912b737f91a94261cfe1fa SHA512 384fc1b4ccb4563106479774afc31ad45565bb3d78572c427e3190593dbc9c136cd4c2efe221a8a381560d0703f35a647b54176a6ea4bcd56c14ccf2ed14dbcb
 DIST apkid-2.1.3.tar.gz 55588 BLAKE2B 5db03e23d24ffba141609ec2ef2f9215784b7446606addb819829625afbe91e338aadf23d1977e13d891d8d20111bb827d8909074d912b737f91a94261cfe1fa SHA512 384fc1b4ccb4563106479774afc31ad45565bb3d78572c427e3190593dbc9c136cd4c2efe221a8a381560d0703f35a647b54176a6ea4bcd56c14ccf2ed14dbcb
 DIST apkid-2.1.4.tar.gz 63232 BLAKE2B 834174af6da2b6e60e0eb0a08ac0bb3615313ec0d146768cc77325709d1e9117e3f330f9e6708cef7469f95656f251c4a7a3a64f6f5e821b9711901c3ab49a4b SHA512 21a2cbde26c178207d946f60934362049692665de46686a576bec487c1597bdd23fa9760fe163620679f32886324234e8ed0fad90e320c119e33a49fe949fe08
+DIST apkid-2.1.5.tar.gz 70193 BLAKE2B 789ef4c05d813732c8addb7c7b8227d8a22cf97eb4cecb8d54232adbbc870d59b4aca316247e28ca3317d1abcf5084486bf98d9f9ebe6bd433d5ceb13de90f26 SHA512 05b43889439b8209b74893778a7d2961f771b6c10e5c2826f3f1442049269bc011dc5a373c114b0887fbdf697422e771ba91503458c92c0591e2aac046891268
diff --git a/dev-python/apkid/apkid-2.1.3.ebuild b/dev-python/apkid/apkid-2.1.3.ebuild
index 27d0de5b7..db4e5073b 100644
--- a/dev-python/apkid/apkid-2.1.3.ebuild
+++ b/dev-python/apkid/apkid-2.1.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1
diff --git a/dev-python/apkid/apkid-2.1.4.ebuild b/dev-python/apkid/apkid-2.1.4.ebuild
index fd423dbaa..51031af5b 100644
--- a/dev-python/apkid/apkid-2.1.4.ebuild
+++ b/dev-python/apkid/apkid-2.1.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1
diff --git a/dev-python/apkid/apkid-2.1.2-r1.ebuild b/dev-python/apkid/apkid-2.1.5.ebuild
similarity index 79%
rename from dev-python/apkid/apkid-2.1.2-r1.ebuild
rename to dev-python/apkid/apkid-2.1.5.ebuild
index da6ee2aa4..506537532 100644
--- a/dev-python/apkid/apkid-2.1.2-r1.ebuild
+++ b/dev-python/apkid/apkid-2.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2028 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1
@@ -11,13 +11,14 @@ inherit distutils-r1
 DESCRIPTION="Android Package Protector Identifier"
 HOMEPAGE="https://github.com/rednaga/APKiD/"
 #Use github to download a version with ./prep-release.py script which compiles yara rules
-HASH_COMMIT="f40e22e73f51615bbaedbc2c8c75a749c1a45d9b"
+HASH_COMMIT="009241dad0ea25a9ad64e0c90eda9ad8e2c77032"
 SRC_URI="https://github.com/rednaga/APKiD/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/yara-python[${PYTHON_USEDEP}]