From 6284b0b2746c8daa8b268f523984172d2066e740 Mon Sep 17 00:00:00 2001
From: Anton Bolshakov <blshkv@gmail.com>
Date: Mon, 25 Mar 2024 21:51:39 +0800
Subject: [PATCH] mobsf: deps fix

---
 dev-python/http-tools/Manifest                |  2 +-
 dev-python/http-tools/http-tools-3.0.0.ebuild |  2 +-
 ...s-2.1.0.ebuild => http-tools-4.0.0.ebuild} |  7 +-
 dev-python/http-tools/metadata.xml            |  4 +
 dev-python/semgrep/Manifest                   |  4 +-
 dev-python/semgrep/metadata.xml               | 12 +++
 dev-python/semgrep/semgrep-0.115.0.ebuild     | 12 +--
 dev-python/semgrep/semgrep-0.55.1.ebuild      | 39 ---------
 dev-python/semgrep/semgrep-0.77.0.ebuild      | 43 ----------
 ...p-0.103.0.ebuild => semgrep-1.66.0.ebuild} | 36 +++++----
 dev-util/mobsf/Manifest                       |  1 -
 dev-util/mobsf/metadata.xml                   |  3 +
 dev-util/mobsf/mobsf-3.6.0.ebuild             | 81 -------------------
 dev-util/mobsf/mobsf-3.6.9.ebuild             |  1 +
 dev-util/mobsf/mobsf-3.7.6.ebuild             |  2 +-
 dev-util/semgrep-core-bin/Manifest            |  2 +-
 dev-util/semgrep-core-bin/metadata.xml        | 11 +++
 .../semgrep-core-bin-0.103.0.ebuild           | 26 ------
 .../semgrep-core-bin-0.115.0.ebuild           | 17 ++--
 .../semgrep-core-bin-0.77.0.ebuild            | 15 ++--
 .../semgrep-core-bin-1.66.0.ebuild            | 26 ++++++
 21 files changed, 107 insertions(+), 239 deletions(-)
 rename dev-python/http-tools/{http-tools-2.1.0.ebuild => http-tools-4.0.0.ebuild} (78%)
 create mode 100644 dev-python/semgrep/metadata.xml
 delete mode 100644 dev-python/semgrep/semgrep-0.55.1.ebuild
 delete mode 100644 dev-python/semgrep/semgrep-0.77.0.ebuild
 rename dev-python/semgrep/{semgrep-0.103.0.ebuild => semgrep-1.66.0.ebuild} (66%)
 delete mode 100644 dev-util/mobsf/mobsf-3.6.0.ebuild
 create mode 100644 dev-util/semgrep-core-bin/metadata.xml
 delete mode 100644 dev-util/semgrep-core-bin/semgrep-core-bin-0.103.0.ebuild
 create mode 100644 dev-util/semgrep-core-bin/semgrep-core-bin-1.66.0.ebuild

diff --git a/dev-python/http-tools/Manifest b/dev-python/http-tools/Manifest
index b227c0bf0..0f4a96324 100644
--- a/dev-python/http-tools/Manifest
+++ b/dev-python/http-tools/Manifest
@@ -1,2 +1,2 @@
-DIST http-tools-2.1.0.tar.gz 540850 BLAKE2B a2d15f4150797734d9012a0cf85f9a4e68cd8dfd9a0c0f0bbc7f400d661b3bae22d83d7ef56896a8b571b7a7b2fe6e69399edcb1f66689a13c09df81ba7d8f74 SHA512 ddfc2456526c5f710a025e05bca471f88adf7aaf0af43445c896bfa0e8b40a2c67f0f10ed100785164b4212bcfecea502c06d60ef841a82a108bfbc7b0fcc37e
 DIST http-tools-3.0.0.tar.gz 549933 BLAKE2B 6f19148ac58030bddbaee39de05d6d0089c880067dfaebd2acba5a72247fb25e88cee36e3f1b120512b6a3ebe8886fe514e0a78a22bb2a98b9dbeb0989e4ca2d SHA512 d0906434c532ee562cf92b3370472084f93750411b7656254cf591f3367ecae56e3b642963a74ead49c6287bedf6d1cbf88efdf9473b46400643baa5fcc34b9d
+DIST http-tools-4.0.0.tar.gz 549944 BLAKE2B 1c1136e6c43601500f6070bb0d08225c4526ebca1839cd2db1e7b26a471d17e980ba6ed0f99fe001048ea57de63c20b4a5c5904f9fd45b6c19133ac255c92703 SHA512 7f35e266e93702e7c74f495fcf87ec5c4c466950d46e166d0384d7c64a034cf96a4abe7d6563c82da8cbaa7c8aed4de3aacf7ae89578567a05a1072335d15aec
diff --git a/dev-python/http-tools/http-tools-3.0.0.ebuild b/dev-python/http-tools/http-tools-3.0.0.ebuild
index 20dc48aa3..c4aa6491f 100644
--- a/dev-python/http-tools/http-tools-3.0.0.ebuild
+++ b/dev-python/http-tools/http-tools-3.0.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/MobSF/httptools"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
+#IUSE="test"
 
 RDEPEND="net-proxy/mitmproxy[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/http-tools/http-tools-2.1.0.ebuild b/dev-python/http-tools/http-tools-4.0.0.ebuild
similarity index 78%
rename from dev-python/http-tools/http-tools-2.1.0.ebuild
rename to dev-python/http-tools/http-tools-4.0.0.ebuild
index 21355af65..9c67174cf 100644
--- a/dev-python/http-tools/http-tools-2.1.0.ebuild
+++ b/dev-python/http-tools/http-tools-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,9 +15,10 @@ HOMEPAGE="https://github.com/MobSF/httptools"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
+#IUSE="test"
 
-RDEPEND="net-proxy/mitmproxy[${PYTHON_USEDEP}]"
+RDEPEND="net-proxy/mitmproxy[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.1.3[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/http-tools/metadata.xml b/dev-python/http-tools/metadata.xml
index ace7c2d3a..c5dd03b09 100644
--- a/dev-python/http-tools/metadata.xml
+++ b/dev-python/http-tools/metadata.xml
@@ -5,4 +5,8 @@
 		<email>unknown@pentoo.ch</email>
 		<name>Author Unknown</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">MobSF/httptools</remote-id>
+		<remote-id type="pypi">http-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/semgrep/Manifest b/dev-python/semgrep/Manifest
index f6828bdb7..f471300b0 100644
--- a/dev-python/semgrep/Manifest
+++ b/dev-python/semgrep/Manifest
@@ -1,4 +1,2 @@
-DIST semgrep-0.103.0.tar.gz 170887 BLAKE2B 1f08511092360f79ff7b63f26c6902514d5491a5faa78b3be9a203cc0c3be5a4b439fd1f8afed6afd1c321f7bb2682d4f27cc13d9754e4a1289bcfdb65d161d3 SHA512 fff8aefc1075171a3453c88c952aa597af27ef17c635a73daf065cf276d4491026b662e4a86237a7e76eced5c2405808b46dd093e44144156df59d371e541adb
 DIST semgrep-0.115.0.tar.gz 198841 BLAKE2B feece943c721a9d3cade10f08f4670a491e8d943f6559409a34bb66fbcfbf529f72665284ba9f243b773e00767938ed3dbc0b5c52d8aedc7a6e24b998fbc7465 SHA512 1e49db382cbc28005ecd60036bc5f503d51d8a47366d5c810659be9d8afbe6d3950e5cc2269ca3e683358f7925ac3d8943059e9e397c3c3a4ef6dfc9a6f3471a
-DIST semgrep-0.55.1.tar.gz 94648 BLAKE2B 471e4a5e25a62fe788bdf65322ea09e598dab1918716ef6492669f0e6db986c367085ff7bf40308af463ae65d7b6f8b23b21ca41508fb1ce40e3a2efc4bfa688 SHA512 45b7a707580d13dd0e77e70b521a29597c72b54164b40747a9697510021f54bd3a614c5fa2a5d72bc8e7ccfd4d852346ba1841da009bcfc9bd5945426026998f
-DIST semgrep-0.77.0.tar.gz 120893 BLAKE2B 18273107a201fd3d1386f9c93b75fbd1eaf3f11e4747747bf3a622d9796de01a7565e5ba6aacc4293e25a291426d1df40cace128ceae65552c22913191220f3b SHA512 14d9b1ab76e9ff00c8229ab54085714f3057e0405b31d3a8f0aeb38e3c3e25add701d4438f31d7614af4e7dc973b120be5edecfa9330aa988faafe58b3067cf5
+DIST semgrep-1.66.0.tar.gz 26571549 BLAKE2B 913233b98bf8d671c64ca2981695b7037b2bd6994b09b4d60ad60723363f897ceea75d6bd79503d8b956bf7194de91dd95515970bd613298a58b4bf589e020a4 SHA512 52c851eeeeb4ff69d3aa5295b8af95013218dbaca73e9defa743c72a3e730e6e708f7872aadedef0255ee45240d597315e0e467ad7c7f75f94b3689af59ac9cd
diff --git a/dev-python/semgrep/metadata.xml b/dev-python/semgrep/metadata.xml
new file mode 100644
index 000000000..38ca02ecc
--- /dev/null
+++ b/dev-python/semgrep/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>unknown@pentoo.ch</email>
+		<name>Author Unknown</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">returntocorp/semgrep</remote-id>
+		<remote-id type="pypi">semgrep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/semgrep/semgrep-0.115.0.ebuild b/dev-python/semgrep/semgrep-0.115.0.ebuild
index 38a49e529..e22d39ab9 100644
--- a/dev-python/semgrep/semgrep-0.115.0.ebuild
+++ b/dev-python/semgrep/semgrep-0.115.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 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..12} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Lightweight static analysis for many languages"
 HOMEPAGE="https://github.com/returntocorp/semgrep"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64"
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/click-option-group-0.5[${PYTHON_USEDEP}]
 	>=dev-python/glom-22.1[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}] <dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}] <dev-python/ruamel-yaml-0.19.0[${PYTHON_USEDEP}]
 	>=dev-python/tqdm-4.46[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.6[${PYTHON_USEDEP}]
diff --git a/dev-python/semgrep/semgrep-0.55.1.ebuild b/dev-python/semgrep/semgrep-0.55.1.ebuild
deleted file mode 100644
index 87e1057e8..000000000
--- a/dev-python/semgrep/semgrep-0.55.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight static analysis for many languages"
-HOMEPAGE="https://github.com/returntocorp/semgrep"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-python/attrs-19.3.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}] <dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.46.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-
-	dev-util/semgrep-core-bin"
-DEPEND="${RDEPEND}"
-
-src_prepare(){
-	rm -r tests
-	sed -i -e 's|~=|>=|g' setup.py || die
-	eapply_user
-}
-
-python_compile() {
-	export SEMGREP_SKIP_BIN=true
-	distutils-r1_python_compile
-}
diff --git a/dev-python/semgrep/semgrep-0.77.0.ebuild b/dev-python/semgrep/semgrep-0.77.0.ebuild
deleted file mode 100644
index c231b8f0b..000000000
--- a/dev-python/semgrep/semgrep-0.77.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight static analysis for many languages"
-HOMEPAGE="https://github.com/returntocorp/semgrep"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-python/attrs-19.3.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/click-8.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-option-group-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}] <dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.46.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-8.3[${PYTHON_USEDEP}]
-	>=dev-python/peewee-3.14.4[${PYTHON_USEDEP}]
-
-	dev-util/semgrep-core-bin"
-DEPEND="${RDEPEND}"
-
-src_prepare(){
-	rm -r tests
-	sed -i -e 's|~=|>=|g' setup.py || die
-	eapply_user
-}
-
-python_compile() {
-	export SEMGREP_SKIP_BIN=true
-	distutils-r1_python_compile
-}
diff --git a/dev-python/semgrep/semgrep-0.103.0.ebuild b/dev-python/semgrep/semgrep-1.66.0.ebuild
similarity index 66%
rename from dev-python/semgrep/semgrep-0.103.0.ebuild
rename to dev-python/semgrep/semgrep-1.66.0.ebuild
index a4bf05718..fe2d628dc 100644
--- a/dev-python/semgrep/semgrep-0.103.0.ebuild
+++ b/dev-python/semgrep/semgrep-1.66.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 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..12} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Lightweight static analysis for many languages"
 HOMEPAGE="https://github.com/returntocorp/semgrep"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64"
@@ -18,21 +18,23 @@ KEYWORDS="amd64"
 RDEPEND="
 	>=dev-python/attrs-21.3[${PYTHON_USEDEP}]
 	>=dev-python/boltons-21.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.1[${PYTHON_USEDEP}]
 	>=dev-python/click-option-group-0.5[${PYTHON_USEDEP}]
-	>=dev-python/glom-22.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}] <dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.46[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-8.3[${PYTHON_USEDEP}]
-	>=dev-python/peewee-3.14[${PYTHON_USEDEP}]
+	>=dev-python/click-8.1[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26[${PYTHON_USEDEP}]
+	>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/glom-22.1[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.6[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
+	>=dev-python/peewee-3.14[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22[${PYTHON_USEDEP}]
+	>=dev-python/rich-12.6.0[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}] <dev-python/ruamel-yaml-0.19.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-4.2[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-2.0[${PYTHON_USEDEP}]
+	>=dev-python/wcmatch-8.3[${PYTHON_USEDEP}]
+
 	dev-util/semgrep-core-bin"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-util/mobsf/Manifest b/dev-util/mobsf/Manifest
index e4708f747..0973bec52 100644
--- a/dev-util/mobsf/Manifest
+++ b/dev-util/mobsf/Manifest
@@ -1,3 +1,2 @@
-DIST mobsf-3.6.0.tar.gz 84781844 BLAKE2B cbcd7fd27309f5848d00af00ef2e8a9c9d4d5e373cd9947e828acab425498b4709929fd0241c8ce296c5fcf8b7fd0e424a6ac87e8fab9728eea8ea327538d9d5 SHA512 4a4a5965bd2dd7254590b60cc97ca914897bf971a38bdd1236877699cf1767ae290bef95df9159a40432fb6daf3ba1fe4f95f69491cbce48ab3201be3268acbb
 DIST mobsf-3.6.9.tar.gz 102714011 BLAKE2B 404fa017e13c0c204042e7f759fda5418e43a42c8a261f312dd658baa3bbfd704f628cf0ae22b3616028ae67ea11de0063d79f1f7ef87adc1678bc831e2e70f5 SHA512 cddb8bd8c09e21b52dac6abe027f4a72379b6eda9ac1c6428775e33c5d8a7c5214791891ac09d316934e569a066f3f665f40bd19b2fb81e77740988d0ee36dac
 DIST mobsf-3.7.6.tar.gz 103883013 BLAKE2B 7bb6bf9e6d8f73765ef65082e194da4d87aa144710fe1466009b3e4698f2bdff98d2e42fb13ad6fbed800b807f0821af92e35a62774eafda786ddec48f1397ac SHA512 d17c8302177fbf3552ee007d456b7fb7aacd34e39f352ecf5b0833e126e7d555e85a5945deb613ee861b669f2e4e0e2b72cf0d0bace755d92932b9ac269dac93
diff --git a/dev-util/mobsf/metadata.xml b/dev-util/mobsf/metadata.xml
index 18952e746..98b30b5ae 100644
--- a/dev-util/mobsf/metadata.xml
+++ b/dev-util/mobsf/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="genymotion">Add <pkg>app-emulation/genymotion-bin</pkg> support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">MobSF/Mobile-Security-Framework-MobSF</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/mobsf/mobsf-3.6.0.ebuild b/dev-util/mobsf/mobsf-3.6.0.ebuild
deleted file mode 100644
index aa7ed20e3..000000000
--- a/dev-util/mobsf/mobsf-3.6.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-#Dynamic Analysis or genymotion
-IUSE="genymotion pdf"
-
-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/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/oscrypto-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/IP2Location-8.8.1[${PYTHON_USEDEP}]
-	>=dev-util/lief-0.12.1[${PYTHON_USEDEP}]
-	>=dev-python/http-tools-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/libsast-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/google-play-scraper-0.1.2[${PYTHON_USEDEP}]
-	>=dev-util/androguard-3.4.0_alpha1[${PYTHON_USEDEP}]
-	>=dev-python/apkid-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/quark-engine-22.6.1[${PYTHON_USEDEP}]
-	>=dev-python/frida-python-15.2.2[${PYTHON_USEDEP}]
-	>=dev-python/tldextract-3.3.1[${PYTHON_USEDEP}]
-	>=dev-python/openstep_parser-1.5.3[${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}]
-
-	dev-python/yara-python[${PYTHON_USEDEP}]
-
-	pdf? ( $(python_gen_cond_dep 'dev-python/pdfkit[${PYTHON_USEDEP}]') )
-	www-servers/gunicorn
-	genymotion? ( app-emulation/genymotion-bin )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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-3.6.9.ebuild b/dev-util/mobsf/mobsf-3.6.9.ebuild
index aa7ed20e3..3b47da261 100644
--- a/dev-util/mobsf/mobsf-3.6.9.ebuild
+++ b/dev-util/mobsf/mobsf-3.6.9.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
diff --git a/dev-util/mobsf/mobsf-3.7.6.ebuild b/dev-util/mobsf/mobsf-3.7.6.ebuild
index 6a0e320b9..f8e8e1fb6 100644
--- a/dev-util/mobsf/mobsf-3.7.6.ebuild
+++ b/dev-util/mobsf/mobsf-3.7.6.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
 MY_PN="Mobile-Security-Framework-MobSF"
diff --git a/dev-util/semgrep-core-bin/Manifest b/dev-util/semgrep-core-bin/Manifest
index 6339a4426..09009f441 100644
--- a/dev-util/semgrep-core-bin/Manifest
+++ b/dev-util/semgrep-core-bin/Manifest
@@ -1,3 +1,3 @@
-DIST semgrep-core-bin-0.103.0.zip 24188286 BLAKE2B 975af789467ffedf842393e0a03037b8cffbd06d13190ac91995a868abac4b8e141963da9cf7b09fef766d0530818a3f44107f76a140462627f8db738e4c0891 SHA512 904e252881fc6ed1a891b19e2eb5d9cb0cf5219b6e0aeac7b32c8a2aa8f1f05ae3404eec881be91b31afdf4da4ad8243829a6f62ff0d41db58dc536fa0fcd60e
+DIST semgrep-1.66.0-cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311-none-any.whl 26981792 BLAKE2B 25e3b83ec8e945ea3a8100024ed4da0245ce28cec9d0e1933af8d37ef2f71d5c4f527dc7b799b7ba5aa3da674be2ff0e968400c61123eee85aa8e6fe13a8637c SHA512 33741983e6d0ba1025cfae26b9b9bf9fe267fd33b41e88704355a1c2e2b372164459f3c5b5fc4970d4a0583df77332f8b8d3c921b9c51c7d791ffbad3efbb1c8
 DIST semgrep-core-bin-0.115.0.zip 25757951 BLAKE2B 8b8bf1c045dcbba56c9d4dfc9af8071a31f8707f1ceedd38b9bb05a1048dc32d9d541e5f1006990dfbab2ff306869684a342ca2f3a84a191b62931a9343a054e SHA512 d9efbf9578c573739ecff59d4c5963d417538c46778e71ea07efecdada66b31415b4c6dd11c508bbddb4d8d6da39b917de8f45fdc401e7cb57a12564f1ce7277
 DIST semgrep-core-bin-0.77.0.zip 21763516 BLAKE2B 38899cd68236444c69bfb36685b30f19a69023d766e569d56abbfc225013ed645b7f808df5a99ac52b40831ff0da3c0c00cd9555aa0a435bbf9dbafd772fbda8 SHA512 1126ebe5662d4feb6ffc2fc242767283705bbf10b91575f88080af6e669a7ab273ddf7f68158442fe25885cc32b3e1c6bce902d9ed195e526547eff19b891668
diff --git a/dev-util/semgrep-core-bin/metadata.xml b/dev-util/semgrep-core-bin/metadata.xml
new file mode 100644
index 000000000..68129c897
--- /dev/null
+++ b/dev-util/semgrep-core-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>unknown@pentoo.ch</email>
+		<name>Author Unknown</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">returntocorp/semgrep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/semgrep-core-bin/semgrep-core-bin-0.103.0.ebuild b/dev-util/semgrep-core-bin/semgrep-core-bin-0.103.0.ebuild
deleted file mode 100644
index c289bfd35..000000000
--- a/dev-util/semgrep-core-bin/semgrep-core-bin-0.103.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight static analysis for many languages"
-HOMEPAGE="https://github.com/returntocorp/semgrep"
-
-PY_VER="cp37.cp38.cp39.py37.py38.py39"
-SRC_URI="
-	https://files.pythonhosted.org/packages/${PY_VER}/${P:0:1}/semgrep/semgrep-${PV}-${PY_VER}-none-any.whl -> ${P}.zip
-"
-#https://files.pythonhosted.org/packages/5e/6e/9af27d57c76abbfe1fda1ebebd41ddc730092bb1bfaa4b6b42ccc2324207/
-#semgrep-0.103.0-cp37.cp38.cp39.py37.py38.py39-none-any.whl
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/semgrep-${PV}.data"
-
-src_install(){
-	dobin purelib/semgrep/bin/semgrep-core
-}
diff --git a/dev-util/semgrep-core-bin/semgrep-core-bin-0.115.0.ebuild b/dev-util/semgrep-core-bin/semgrep-core-bin-0.115.0.ebuild
index c289bfd35..a956a8925 100644
--- a/dev-util/semgrep-core-bin/semgrep-core-bin-0.115.0.ebuild
+++ b/dev-util/semgrep-core-bin/semgrep-core-bin-0.115.0.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit pypi
 
 DESCRIPTION="Lightweight static analysis for many languages"
 HOMEPAGE="https://github.com/returntocorp/semgrep"
 
-PY_VER="cp37.cp38.cp39.py37.py38.py39"
-SRC_URI="
-	https://files.pythonhosted.org/packages/${PY_VER}/${P:0:1}/semgrep/semgrep-${PV}-${PY_VER}-none-any.whl -> ${P}.zip
-"
-#https://files.pythonhosted.org/packages/5e/6e/9af27d57c76abbfe1fda1ebebd41ddc730092bb1bfaa4b6b42ccc2324207/
-#semgrep-0.103.0-cp37.cp38.cp39.py37.py38.py39-none-any.whl
+PY_TAG="cp37.cp38.cp39.py37.py38.py39"
+#SRC_URI="$(pypi_wheel_url semgrep ${PV} ${PY_TAG})"
+SRC_URI="https://files.pythonhosted.org/packages/${PY_TAG}/${P:0:1}/semgrep/semgrep-${PV}-${PY_TAG}-none-any.whl -> ${P}.zip"
+
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/semgrep-${PV}.data"
 
diff --git a/dev-util/semgrep-core-bin/semgrep-core-bin-0.77.0.ebuild b/dev-util/semgrep-core-bin/semgrep-core-bin-0.77.0.ebuild
index e5eecd7cd..0046e295c 100644
--- a/dev-util/semgrep-core-bin/semgrep-core-bin-0.77.0.ebuild
+++ b/dev-util/semgrep-core-bin/semgrep-core-bin-0.77.0.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit pypi
 
 DESCRIPTION="Lightweight static analysis for many languages"
 HOMEPAGE="https://github.com/returntocorp/semgrep"
 
-PY_VER="cp36.cp37.cp38.cp39.py36.py37.py38.py39"
-SRC_URI="
-	https://files.pythonhosted.org/packages/${PY_VER}/${P:0:1}/semgrep/semgrep-${PV}-${PY_VER}-none-any.whl -> ${P}.zip
-"
+PY_TAG="cp36.cp37.cp38.cp39.py36.py37.py38.py39"
+#SRC_URI="$(pypi_wheel_url semgrep ${PV} ${PY_TAG})"
+SRC_URI="https://files.pythonhosted.org/packages/${PY_TAG}/${P:0:1}/semgrep/semgrep-${PV}-${PY_TAG}-none-any.whl -> ${P}.zip"
+
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/semgrep-${PV}.data"
 
diff --git a/dev-util/semgrep-core-bin/semgrep-core-bin-1.66.0.ebuild b/dev-util/semgrep-core-bin/semgrep-core-bin-1.66.0.ebuild
new file mode 100644
index 000000000..c6f0b6a3f
--- /dev/null
+++ b/dev-util/semgrep-core-bin/semgrep-core-bin-1.66.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Lightweight static analysis for many languages"
+HOMEPAGE="https://github.com/returntocorp/semgrep"
+
+PY_TAG="cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311"
+#SRC_URI="https://files.pythonhosted.org/packages/${PY_TAG}/${P:0:1}/semgrep/semgrep-${PV}-${PY_TAG}-none-any.whl -> ${P}.zip"
+
+SRC_URI="$(pypi_wheel_url semgrep ${PV} ${PY_TAG})"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/semgrep-${PV}.data"
+
+src_install(){
+	dobin purelib/semgrep/bin/semgrep-core
+}