objection: sensepost/objection#652

pentoo · Feb 29, 2024 · ea6e206 · ea6e206
1 parent 46124b7
commit ea6e206
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 31 deletions.
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
diff --git a/dev-python/semver/semver-2.13.0-r1.ebuild b/dev-python/semver/semver-2.13.0-r1.ebuild
diff --git a/dev-util/objection/metadata.xml b/dev-util/objection/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="patchapk">Add support to patch APKs</flag>
 	</use>
+	<upstream>
+		 <remote-id type="github">sensepost/objection</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/objection/objection-1.10.2.ebuild b/dev-util/objection/objection-1.10.2.ebuild
@@ -1,10 +1,10 @@
-# 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
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Runtime mobile exploration"

diff --git a/...util/objection/objection-1.11.0-r1.ebuild → ...util/objection/objection-1.11.0-r2.ebuild b/...util/objection/objection-1.11.0-r1.ebuild → ...util/objection/objection-1.11.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# 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_{10..12} )
 inherit distutils-r1
 
@@ -22,7 +23,7 @@ RDEPEND=">=dev-util/frida-tools-7.0.0[${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/semver-2*[${PYTHON_USEDEP}]
+	>=dev-python/semver-2[${PYTHON_USEDEP}]
 	dev-python/delegator[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
@@ -45,6 +46,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	rm -r tests
+	# https://github.com/sensepost/objection/issues/652
+	sed -i "s|semver>=2,<3|semver>=2|" requirements.txt || die
 	mv "${WORKDIR}/node_modules" "${S}/agent/" || die "unable to move node_modules"
 	eapply_user
 }