From ea6e206e81eef891e07f981fd889ce94107d876d Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Thu, 29 Feb 2024 10:19:29 +0800 Subject: [PATCH] objection: https://github.com/sensepost/objection/issues/652 --- dev-python/semver/Manifest | 1 - dev-python/semver/semver-2.13.0-r1.ebuild | 25 ------------------- dev-util/objection/metadata.xml | 3 +++ dev-util/objection/objection-1.10.2.ebuild | 6 ++--- ...0-r1.ebuild => objection-1.11.0-r2.ebuild} | 7 ++++-- 5 files changed, 11 insertions(+), 31 deletions(-) delete mode 100644 dev-python/semver/Manifest delete mode 100644 dev-python/semver/semver-2.13.0-r1.ebuild rename dev-util/objection/{objection-1.11.0-r1.ebuild => objection-1.11.0-r2.ebuild} (87%) diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest deleted file mode 100644 index fcb567acb5..0000000000 --- a/dev-python/semver/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST semver-2.13.0.gh.tar.gz 43674 BLAKE2B 35d0ca0b61836d0e6deb97f067a0c1cbba310dde6eb83d78f02f85c3f7485114ad549559d572d4494aa7c4444c7d6feabcb36394561a238489d56bfd04ed8590 SHA512 ca0d408d8bb7305e90802ea04d935cd7b76b8f166a9ec97ed3427dbc2cf60eeca0b2d27ad0cb2f15f32f5b2589d6717a63717c463183374c5335bf79e1eec222 diff --git a/dev-python/semver/semver-2.13.0-r1.ebuild b/dev-python/semver/semver-2.13.0-r1.ebuild deleted file mode 100644 index 64394414f8..0000000000 --- a/dev-python/semver/semver-2.13.0-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -inherit distutils-r1 - -DESCRIPTION="A Python module for semantic versioning" -HOMEPAGE="https://github.com/python-semver/python-semver" -SRC_URI="https://github.com/python-${PN}/python-${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}/python-${P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" - -distutils_enable_tests pytest - -python_prepare_all() { - # contains pytest/cov args we don't want - rm setup.cfg || die - distutils-r1_python_prepare_all -} diff --git a/dev-util/objection/metadata.xml b/dev-util/objection/metadata.xml index 7295a66c29..2b5093d91b 100644 --- a/dev-util/objection/metadata.xml +++ b/dev-util/objection/metadata.xml @@ -8,4 +8,7 @@ Add support to patch APKs + + sensepost/objection + diff --git a/dev-util/objection/objection-1.10.2.ebuild b/dev-util/objection/objection-1.10.2.ebuild index 96988a9b59..db03c9ddda 100644 --- 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/dev-util/objection/objection-1.11.0-r1.ebuild b/dev-util/objection/objection-1.11.0-r2.ebuild similarity index 87% rename from dev-util/objection/objection-1.11.0-r1.ebuild rename to dev-util/objection/objection-1.11.0-r2.ebuild index 20b6f0d41f..e221cf1b83 100644 --- a/dev-util/objection/objection-1.11.0-r1.ebuild +++ b/dev-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/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 }