diff --git a/dev-debug/dwarf-debugger/dwarf-debugger-1.1.3-r1.ebuild b/dev-debug/dwarf-debugger/dwarf-debugger-1.1.3-r2.ebuild
similarity index 94%
rename from dev-debug/dwarf-debugger/dwarf-debugger-1.1.3-r1.ebuild
rename to dev-debug/dwarf-debugger/dwarf-debugger-1.1.3-r2.ebuild
index 6b3f4812b..e463e4f99 100644
--- a/dev-debug/dwarf-debugger/dwarf-debugger-1.1.3-r1.ebuild
+++ b/dev-debug/dwarf-debugger/dwarf-debugger-1.1.3-r2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~arm64 x86"
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/capstone-4.0.1[python,${PYTHON_USEDEP}]
 	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/frida-12.8.0[${PYTHON_USEDEP}]
+	>=virtual/frida-12.8.0[${PYTHON_USEDEP}]
 	>=dev-python/pyqt5-5.11.3[${PYTHON_USEDEP}]
 	>=dev-python/pyperclip-1.7.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/frida/frida-16.1.8.ebuild b/dev-python/frida/frida-16.1.8-r1.ebuild
similarity index 93%
rename from dev-python/frida/frida-16.1.8.ebuild
rename to dev-python/frida/frida-16.1.8-r1.ebuild
index 9e4952840..af1bd94ea 100644
--- a/dev-python/frida/frida-16.1.8.ebuild
+++ b/dev-python/frida/frida-16.1.8-r1.ebuild
@@ -20,7 +20,9 @@ KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="~dev-libs/frida-core-${PV}
 	dev-python/typing-extensions[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}
+	!!dev-python/frida-bin
+"
 
 # The QA_WX error is due to frida-core pre-build lib
 QA_PREBUILT="usr/lib/python*/site-packages/_frida.abi3.so"
diff --git a/dev-util/androguard/Manifest b/dev-util/androguard/Manifest
index 53391e46f..9263e9535 100644
--- a/dev-util/androguard/Manifest
+++ b/dev-util/androguard/Manifest
@@ -1,2 +1 @@
-DIST androguard-4.1.2.tar.gz 888802 BLAKE2B b4bf4b4e4cce688e741cdfbeca98296ce934703e66bd591836da53c54b9239569a716b743eec148dcc2921e8eb775d5abcb02510c7a9e7008654e2e1f89eff5b SHA512 a5dee9667e5387c1a0ae11f5fd2656da68082bbfdad3775c0c5d7c1f01f0cf3c380e2f17f6b68ea3259ffdefbffbc0f3c5ac978045fabd6897eb3ad552f33ba5
 DIST androguard-4.1.3.tar.gz 896277 BLAKE2B 7fe1c1fb7a63551fdbbe90a28268a85bb1d8392e0a9f69892e3e57a0fc4be0837f47c8b3ec69a101a2f96de7a2eb7f8e1c434e75d4eb82eed8d0094ca0018fd0 SHA512 f8c544d776e3f8590352ddd2dbcaa95e309e33e694ceaf4ce27ae4b2aec6d63bf2d0acb7244dd6f97d2c907990cb3ad3565dce3254de3f9dbdbf43a079cef8ed
diff --git a/dev-util/androguard/androguard-4.1.2-r1.ebuild b/dev-util/androguard/androguard-4.1.3-r1.ebuild
similarity index 96%
rename from dev-util/androguard/androguard-4.1.2-r1.ebuild
rename to dev-util/androguard/androguard-4.1.3-r1.ebuild
index 44a94527e..9967193bf 100644
--- a/dev-util/androguard/androguard-4.1.2-r1.ebuild
+++ b/dev-util/androguard/androguard-4.1.3-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/ipython-5.0.0[${PYTHON_USEDEP}]
 	dev-python/mutf8[${PYTHON_USEDEP}]
 	dev-python/dataset[${PYTHON_USEDEP}]
-	dev-python/frida[${PYTHON_USEDEP}]
+	virtual/frida[${PYTHON_USEDEP}]
 	dev-python/loguru[${PYTHON_USEDEP}]
 	>=dev-util/apkInspector-1.1.7[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-util/androguard/androguard-4.1.3.ebuild b/dev-util/androguard/androguard-4.1.3.ebuild
deleted file mode 100644
index 44a94527e..000000000
--- a/dev-util/androguard/androguard-4.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{11..13} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read Android's binary format for XML files (AXML) and a decompiler for DEX"
-HOMEPAGE="https://github.com/androguard/androguard"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-# no proper test scripts
-#RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/pydot-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/ipython-5.0.0[${PYTHON_USEDEP}]
-	dev-python/mutf8[${PYTHON_USEDEP}]
-	dev-python/dataset[${PYTHON_USEDEP}]
-	dev-python/frida[${PYTHON_USEDEP}]
-	dev-python/loguru[${PYTHON_USEDEP}]
-	>=dev-util/apkInspector-1.1.7[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pyqt5[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/frida-tools/frida-tools-14.1.1.ebuild b/dev-util/frida-tools/frida-tools-14.1.1.ebuild
index 708c9e01d..73a5c9c8b 100644
--- a/dev-util/frida-tools/frida-tools-14.1.1.ebuild
+++ b/dev-util/frida-tools/frida-tools-14.1.1.ebuild
@@ -19,10 +19,7 @@ KEYWORDS="amd64 ~arm64 x86"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	>=dev-python/colorama-0.2.7[${PYTHON_USEDEP}]
-	|| (
-		>=dev-python/frida-bin-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/frida-17.1.0[${PYTHON_USEDEP}]
-	)
+	virtual/frida[${PYTHON_USEDEP}]
 	>=dev-python/prompt-toolkit-3.0.3[${PYTHON_USEDEP}] <dev-python/prompt-toolkit-4.0.0
 	>=dev-python/pygments-2.0.2[${PYTHON_USEDEP}]
 	dev-python/websockets[${PYTHON_USEDEP}]"
diff --git a/dev-util/jnitrace/Manifest b/dev-util/jnitrace/Manifest
index 7b9a8eae5..a7375bac5 100644
--- a/dev-util/jnitrace/Manifest
+++ b/dev-util/jnitrace/Manifest
@@ -1,2 +1 @@
-DIST jnitrace-3.3.0.tar.gz 33782 BLAKE2B 1ccd853f7da1f5c6e0a8ca7ebb16663b4ffd12fa8c1967ed17cfd34db954c27d0ef19b12896ab9bf8dfe79bd9e645d281a9c800a984ae30ce0e32d61377bc646 SHA512 d5a2ce4d036d00e8b28ea70fe7d046bbdfc9f4ae87dbaebd3a0ba181dd2bfbcafd071dd651c81b4c6adeef21d56df9b7d287f3526af212c88fe16add995202fa
 DIST jnitrace-3.3.1.tar.gz 33711 BLAKE2B 6847d9ee6308050e8ca8d77b28ec3dc5ea4d29c33cb9a84d2f9f33cb95567a95537d7da85287481fa53e5354a315eb5740021bc3b5728be361e00a230a9fd0eb SHA512 8b34a5fab4a7ba8d2af4d7e01986c52daad272b4ac174f072d6a1f1c4e660e54e9832f2afe936b699e4eea8134094f880c4e4269e02758c98f586d2b2085daa5
diff --git a/dev-util/jnitrace/jnitrace-3.3.0.ebuild b/dev-util/jnitrace/jnitrace-3.3.0.ebuild
deleted file mode 100644
index f3daa8a21..000000000
--- a/dev-util/jnitrace/jnitrace-3.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Frida based tool that traces usage of the JNI API in Android apps."
-HOMEPAGE="https://github.com/chame1eon/jnitrace"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND=">=dev-python/frida-14.0.5[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/hexdump[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-util/jnitrace/jnitrace-3.3.1.ebuild b/dev-util/jnitrace/jnitrace-3.3.1-r1.ebuild
similarity index 74%
rename from dev-util/jnitrace/jnitrace-3.3.1.ebuild
rename to dev-util/jnitrace/jnitrace-3.3.1-r1.ebuild
index eb14966ab..4576a6a8b 100644
--- a/dev-util/jnitrace/jnitrace-3.3.1.ebuild
+++ b/dev-util/jnitrace/jnitrace-3.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,18 +6,16 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{11..13} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A Frida based tool that traces usage of the JNI API in Android apps."
 HOMEPAGE="https://github.com/chame1eon/jnitrace"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
 
-RDEPEND=">=dev-python/frida-14.0.5[${PYTHON_USEDEP}]
+RDEPEND=">=virtual/frida-14.0.5[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/hexdump[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/jnitrace/metadata.xml b/dev-util/jnitrace/metadata.xml
index ace7c2d3a..22164a1f9 100644
--- a/dev-util/jnitrace/metadata.xml
+++ b/dev-util/jnitrace/metadata.xml
@@ -5,4 +5,8 @@
 		<email>unknown@pentoo.ch</email>
 		<name>Author Unknown</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">chame1eon/jnitrace</remote-id>
+		<remote-id type="pypi">jnitrace</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/mobsf/Manifest b/dev-util/mobsf/Manifest
index 6b6680686..140c9eed0 100644
--- a/dev-util/mobsf/Manifest
+++ b/dev-util/mobsf/Manifest
@@ -1,3 +1 @@
-DIST mobsf-3.9.7.tar.gz 95335051 BLAKE2B eaf77e4843662992c1074adb486e6f338b2549a66e483dd16bfe42a8658ec6e08812d477ee74021c4b0f05d8160b31d4bcb0ec1b12569668fdf914382706ffa9 SHA512 f6aba220da9411ae00afe3d6e87bbb9023625923240c1f5e22b34cb38ea59e329c02b19ca5cce894458c72a72c07ef5a875f1563450a5284e02122a5e4922893
-DIST mobsf-4.0.7.tar.gz 125903114 BLAKE2B 6ac72053839aaebde541e801d93f7c9af00204d4303b5af9455f90b0f0d75427b7ef215fda19e13775974a83291ddf5092f89d1c2688fcdb2b237880c6135e24 SHA512 117c3d735a81b73e31d17b69cbbe5692b3bf6b78ac82b9678d40d54923a5f2a4d1f94c9f81061e8900fb0be750c85d1251d00169ba09dca909eb14ef6c53e3fc
 DIST mobsf-4.3.2.tar.gz 103836219 BLAKE2B 61f59387a38428b075f997aa8e22603306c5f2ee5eb433b720feafb1c814aaaa4c9a917b79ba103a8a2f613ae8b04210d6e154fb0d550bf1a9b38e7e13e24db2 SHA512 f58c691d8965230e2aefe05fe1c5a1e2a465fdc44d89561b74a028b452bca3f0dc31b71e6fb7e86b15e390278e4294a6e40e64badc9c91354a935f1eef37c0c7
diff --git a/dev-util/mobsf/mobsf-3.9.7.ebuild b/dev-util/mobsf/mobsf-3.9.7.ebuild
deleted file mode 100644
index 54461f22b..000000000
--- a/dev-util/mobsf/mobsf-3.9.7.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{11..13} )
-inherit distutils-r1
-
-MY_PN="Mobile-Security-Framework-MobSF"
-
-DESCRIPTION="Automated, all-in-one mobile application (Android/iOS/Windows) pen-testing"
-HOMEPAGE="https://github.com/MobSF/Mobile-Security-Framework-MobSF"
-SRC_URI="https://github.com/MobSF/Mobile-Security-Framework-MobSF/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-#Dynamic Analysis or genymotion
-IUSE="genymotion"
-
-QA_FLAGS_IGNORED="usr/lib/python.*/site-packages/mobsf/DynamicAnalyzer.*
-		usr/lib/python.*/site-packages/mobsf/StaticAnalyzer.*"
-QA_PRESTRIPPED="usr/lib/python.*/site-packages/mobsf/DynamicAnalyzer.*
-		usr/lib/python.*/site-packages/mobsf/StaticAnalyzer.*"
-
-RDEPEND="
-	>=dev-python/django-3.1.5[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6.2[${PYTHON_USEDEP}]
-	>=dev-python/rsa-4.7[${PYTHON_USEDEP}]
-	>=dev-python/biplist-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup4-0.0.1[${PYTHON_USEDEP}]
-	>=dev-python/colorlog-4.7.2[${PYTHON_USEDEP}]
-	>=dev-python/macholib-1.14[${PYTHON_USEDEP}]
-	>=dev-python/whitenoise-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/shelljob-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/IP2Location-8.10.0[${PYTHON_USEDEP}]
-	>=dev-util/lief-0.12.3[${PYTHON_USEDEP}]
-	>=dev-python/http_tools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/google-play-scraper-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/apkid-2.1.5[${PYTHON_USEDEP}]
-	>=dev-python/frida-16.1.4[${PYTHON_USEDEP}]
-	>=dev-python/tldextract-3.4.4[${PYTHON_USEDEP}]
-	>=dev-python/openstep_parser-1.5.4[${PYTHON_USEDEP}]
-	>=dev-python/svgutils-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/arpy-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/apksigtool-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/tzdata-2023.3[${PYTHON_USEDEP}]
-	>=dev-python/libsast-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-3.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.16.0[${PYTHON_USEDEP}]
-
-	>=dev-python/ruamel-yaml-0.16.13[${PYTHON_USEDEP}]
-	>=dev-python/click-8.0.1[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn
-
-	dev-python/yara-python[${PYTHON_USEDEP}]
-
-	www-servers/gunicorn
-	genymotion? ( app-emulation/genymotion-bin )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	#regular user support
-	sed -e 's|USE_HOME = False|USE_HOME = True|' -i ./mobsf/MobSF/settings.py || die "sed settings failed"
-
-#	sed -e '/waitress/d' \
-#	-e '/pyOpenSSL/d' -e '/cryptography/d' \
-#	-e '/bs4/d'  -i requirements.txt || die "sed failed"
-#	sed -e 's|==|>=|' -i requirements.txt || die "sed failed"
-
-#	use pdf || sed -e '/pdfkit/d' -i requirements.txt || die "sed failed"
-
-	./manage.py makemigrations
-	./manage.py makemigrations StaticAnalyzer
-	./manage.py migrate
-
-	eapply_user
-}
diff --git a/dev-util/mobsf/mobsf-4.0.7.ebuild b/dev-util/mobsf/mobsf-4.0.7.ebuild
deleted file mode 100644
index b6a8cb931..000000000
--- a/dev-util/mobsf/mobsf-4.0.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{11..13} )
-inherit distutils-r1
-
-MY_PN="Mobile-Security-Framework-MobSF"
-
-DESCRIPTION="Automated, all-in-one mobile application (Android/iOS/Windows) pen-testing"
-HOMEPAGE="https://github.com/MobSF/Mobile-Security-Framework-MobSF"
-SRC_URI="https://github.com/MobSF/Mobile-Security-Framework-MobSF/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-#Dynamic Analysis or genymotion
-IUSE="genymotion"
-
-QA_FLAGS_IGNORED="usr/lib/python.*/site-packages/mobsf/DynamicAnalyzer.*
-		usr/lib/python.*/site-packages/mobsf/StaticAnalyzer.*"
-QA_PRESTRIPPED="usr/lib/python.*/site-packages/mobsf/DynamicAnalyzer.*
-		usr/lib/python.*/site-packages/mobsf/StaticAnalyzer.*"
-
-RDEPEND="
-	>=dev-python/django-3.1.5[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6.2[${PYTHON_USEDEP}]
-	>=dev-python/rsa-4.7[${PYTHON_USEDEP}]
-	>=dev-python/biplist-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup4-0.0.1[${PYTHON_USEDEP}]
-	>=dev-python/colorlog-4.7.2[${PYTHON_USEDEP}]
-	>=dev-python/macholib-1.14[${PYTHON_USEDEP}]
-	>=dev-python/whitenoise-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/shelljob-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/IP2Location-8.10.0[${PYTHON_USEDEP}]
-	>=dev-util/lief-0.13.2[${PYTHON_USEDEP}]
-	>=dev-python/http_tools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/google-play-scraper-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/apkid-2.1.5[${PYTHON_USEDEP}]
-	>=dev-python/frida-16.1.4[${PYTHON_USEDEP}]
-	>=dev-python/tldextract-3.4.4[${PYTHON_USEDEP}]
-	>=dev-python/openstep_parser-1.5.4[${PYTHON_USEDEP}]
-	>=dev-python/svgutils-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/arpy-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/apksigtool-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/tzdata-2023.3[${PYTHON_USEDEP}]
-	>=dev-python/libsast-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-3.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/django-brake-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python3-saml-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/bcrypt-4.0.1[${PYTHON_USEDEP}]
-
-	>=dev-python/ruamel-yaml-0.16.13[${PYTHON_USEDEP}]
-	>=dev-python/click-8.0.1[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn
-
-	dev-python/yara-python[${PYTHON_USEDEP}]
-
-	www-servers/gunicorn
-	genymotion? ( app-emulation/genymotion-bin )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	#regular user support
-	sed -e 's|USE_HOME = False|USE_HOME = True|' -i ./mobsf/MobSF/settings.py || die "sed settings failed"
-
-#	sed -e '/waitress/d' \
-#	-e '/pyOpenSSL/d' -e '/cryptography/d' \
-#	-e '/bs4/d'  -i requirements.txt || die "sed failed"
-#	sed -e 's|==|>=|' -i requirements.txt || die "sed failed"
-
-#	use pdf || sed -e '/pdfkit/d' -i requirements.txt || die "sed failed"
-
-	./manage.py makemigrations
-	./manage.py makemigrations StaticAnalyzer
-	./manage.py migrate
-
-	eapply_user
-}
diff --git a/dev-util/mobsf/mobsf-4.3.2.ebuild b/dev-util/mobsf/mobsf-4.3.2-r1.ebuild
similarity index 98%
rename from dev-util/mobsf/mobsf-4.3.2.ebuild
rename to dev-util/mobsf/mobsf-4.3.2-r1.ebuild
index 647e3bff3..66da443f3 100644
--- a/dev-util/mobsf/mobsf-4.3.2.ebuild
+++ b/dev-util/mobsf/mobsf-4.3.2-r1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	>=dev-python/IP2Location-8.10.4[${PYTHON_USEDEP}]
 	>=dev-python/google-play-scraper-0.1.2[${PYTHON_USEDEP}]
 	>=dev-python/apkid-2.1.5[${PYTHON_USEDEP}]
-	>=dev-python/frida-16.1.4[${PYTHON_USEDEP}]
+	>=virtual/frida-16.1.4[${PYTHON_USEDEP}]
 	>=dev-python/tldextract-5.1.3[${PYTHON_USEDEP}]
 	>=dev-python/openstep_parser-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/svgutils-0.3.4[${PYTHON_USEDEP}]
diff --git a/dev-util/objection/Manifest b/dev-util/objection/Manifest
index 9b8365b62..9c9f4c325 100644
--- a/dev-util/objection/Manifest
+++ b/dev-util/objection/Manifest
@@ -1,3 +1,2 @@
-DIST objection-1.10.2.tar.gz 1702233 BLAKE2B 0aec05d65bb7a284d8caa34f53c6dcbfcb2a9747dabad8c8e17ea5aa945ad67ed0209e76a81bc7713461c61804b270c868d537cd880922d4c6f2b6aee1e39f1e SHA512 5fdc70a1d3c20f9545edffe8a544ffbaa56f65abbb303626740fb3ffea70076a9d98213459f1d603928dafc0e7a1be017ca3f39e80081b849fa9faf69dd0ebdf
 DIST objection-1.11.0.tar.gz 1702819 BLAKE2B 8abbb0af21e2fc4cbae73753f6b15353f93918f0d03abd5e0670772596db00890731489614e224e2bf9e389cda7fb92c9460314affb8074f66fc983c1c314797 SHA512 a69237c963bef05d87dd142b52a2d34f1839ba9e95d4e409d6ec954f0cc5c9fc808cdbaea87a2622128b1a9a068a7acad5ee8bb3e1175515572b0d3fdbe580d7
 DIST objection-1.9.5-node_modules.tar.gz 17429880 BLAKE2B 33496aefdfb8583fb8310bb97fd19fcf454ba49a13b5c3abd09c367c777331ff3efa45e208c9c9320e800ef943c557f77f000bc302b15feceeef61b0e15fe3ec SHA512 1a220de76e158bd33a97c148735d92be4e60878e8fec0990656c3176c00a5097dbeb0782893bb8484e3372f58074b230324bd82494f8ce2a314dcc255e625348
diff --git a/dev-util/objection/objection-1.10.2.ebuild b/dev-util/objection/objection-1.10.2.ebuild
deleted file mode 100644
index 588dbd226..000000000
--- a/dev-util/objection/objection-1.10.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
-inherit distutils-r1
-
-DESCRIPTION="Runtime mobile exploration"
-HOMEPAGE="https://github.com/sensepost/objection"
-#to re-generate node_modules run "npm build agent/" in WORKDIR
-SRC_URI="https://github.com/sensepost/objection/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.pentoo.ch/~blshkv/distfiles/objection-1.9.5-node_modules.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="patchapk"
-
-RDEPEND=">=dev-util/frida-tools-7.0.0[${PYTHON_USEDEP}]
-	dev-python/frida[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.3[${PYTHON_USEDEP}] <dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/tabulate[${PYTHON_USEDEP}]
-	dev-python/delegator[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-db/litecli-1.3.0[${PYTHON_USEDEP}]
-	net-libs/nodejs[npm]
-	patchapk? (
-		dev-util/android-sdk-build-tools
-		dev-util/android-tools
-		virtual/jdk:*
-		dev-util/apktool
-	)"
-#patchapk
-#https://github.com/sensepost/objection/wiki/Patching-Android-Applications#patching---dependencies
-#patchipa
-#https://github.com/sensepost/objection/wiki/Patching-iOS-Applications#patching---dependencies
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	rm -r tests
-	mv "${WORKDIR}/node_modules" "${S}/agent/" || die "unable to move node_modules"
-	eapply_user
-}
-
-python_compile() {
-	addpredict /etc/npm
-	emake frida-agent
-	distutils-r1_python_compile
-}
diff --git a/dev-util/objection/objection-1.11.0-r2.ebuild b/dev-util/objection/objection-1.11.0-r3.ebuild
similarity index 96%
rename from dev-util/objection/objection-1.11.0-r2.ebuild
rename to dev-util/objection/objection-1.11.0-r3.ebuild
index 53f2099fc..f6ad69c26 100644
--- a/dev-util/objection/objection-1.11.0-r2.ebuild
+++ b/dev-util/objection/objection-1.11.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="patchapk"
 
 RDEPEND=">=dev-util/frida-tools-7.0.0[${PYTHON_USEDEP}]
-	dev-python/frida[${PYTHON_USEDEP}]
+	virtual/frida[${PYTHON_USEDEP}]
 	>=dev-python/prompt-toolkit-3.0.3[${PYTHON_USEDEP}] <dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/tabulate[${PYTHON_USEDEP}]
diff --git a/virtual/frida/frida-17.1.0.ebuild b/virtual/frida/frida-17.1.0.ebuild
new file mode 100644
index 000000000..bdb3c969d
--- /dev/null
+++ b/virtual/frida/frida-17.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+inherit python-r1
+
+DESCRIPTION="Virtual for Frida"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		>=dev-python/frida-bin-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/frida-17.1.0[${PYTHON_USEDEP}]
+	)"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"