commit:     7c72706d40901eecb38edf7298bb6691235192d5
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Tue Apr 22 20:47:16 2025 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Apr 29 07:35:19 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c72706d

net-analyzer/ospd-openvas: add 22.8.2, porting to Python 3.13

Closes: https://bugs.gentoo.org/952573
Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/41705
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/ospd-openvas/Manifest                       |  1 +
 net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r1.ebuild  |  3 +--
 ...envas-22.7.1-r1.ebuild => ospd-openvas-22.8.2.ebuild} | 16 ++++------------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/net-analyzer/ospd-openvas/Manifest 
b/net-analyzer/ospd-openvas/Manifest
index 98fce6477374..d7afebfb2d58 100644
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@@ -1,2 +1,3 @@
 DIST ospd-openvas-22.7.1-add-delay-in-mqtt-test.patch 1238 BLAKE2B 
72d107f5056b72f7269e7408712b6a6a67b201c71024eff299eca0b1b5471dceb69c5d00df2d021d81cfd465bec85ea743f1e4c566840264d3f40481f5bca639
 SHA512 
c37e0d69ac4eb0eb6ee48c3f519c6ad2049b3cb81904fa9c0475e4fb700a2addf57001f277fdc0e48d40fb23b835ed17400cda3d46db5fa7e61babd1ee7d7c14
 DIST ospd-openvas-22.7.1.tar.gz 250148 BLAKE2B 
7840376790f451e9316ad33556bac49e9672c7911ac0e3813e4c3a182a06b2c603fa80fa6ac6d2822c87ca35df172d99a3b60d3e16649328387267080572a507
 SHA512 
ae7fe56a2b825efc33d9e29f2a51ab1034155ee70a5790d98f3b811a29f4b35830afabc27abd14593d74e1bcc5dac0ea1cd33ed46cc3ca459256a4b452e10552
+DIST ospd-openvas-22.8.2.tar.gz 250151 BLAKE2B 
444ce2e73c32367530c14d1b698e5b7563ddb6f7775e517064185713edb8348c6d8f4ee3c3fa1f8edbcb3ff4c2d6720d7fc29d6fa5f6889b486e0d40f0c5972d
 SHA512 
72d868f41f575d0ef20b665afaf32113bf40f37f1f3a0626ec432f5e1e2f0ebade283c13c2a8c9dc8eab185997bcd9d890a9be0bc5964e7c65f32ba8b24ee070

diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r1.ebuild 
b/net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r1.ebuild
index 4830118bd01b..6d59c3fd9df5 100644
--- a/net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r1.ebuild
+++ b/net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} pypy3 pypy3_11 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
 DISTUTILS_USE_PEP517=poetry
 inherit distutils-r1 systemd
 
@@ -34,7 +34,6 @@ DEPEND="
        <dev-python/python-gnupg-0.6.0[${PYTHON_USEDEP}]
        >=dev-python/paho-mqtt-1.6[${PYTHON_USEDEP}]
        <dev-python/paho-mqtt-3[${PYTHON_USEDEP}]
-       >=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}]
        net-libs/paho-mqtt-c
        app-misc/mosquitto
 "

diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r1.ebuild 
b/net-analyzer/ospd-openvas/ospd-openvas-22.8.2.ebuild
similarity index 83%
copy from net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r1.ebuild
copy to net-analyzer/ospd-openvas/ospd-openvas-22.8.2.ebuild
index 4830118bd01b..738c041961ed 100644
--- a/net-analyzer/ospd-openvas/ospd-openvas-22.7.1-r1.ebuild
+++ b/net-analyzer/ospd-openvas/ospd-openvas-22.8.2.ebuild
@@ -3,21 +3,17 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} pypy3 pypy3_11 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
 DISTUTILS_USE_PEP517=poetry
 inherit distutils-r1 systemd
 
 DESCRIPTION="This is an OSP server implementation to allow GVM to remotely 
control OpenVAS"
 HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/ospd-openvas";
-SRC_URI="
-       https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-       
https://github.com/greenbone/ospd-openvas/commit/f968bcc540c22dad89a2ee3bdfc6384b97b6fa0f.patch
-               -> ${PN}-22.7.1-add-delay-in-mqtt-test.patch
-"
+SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="AGPL-3+ GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="doc +notus"
 
 DEPEND="
@@ -29,12 +25,12 @@ DEPEND="
        >=dev-python/packaging-20.4[${PYTHON_USEDEP}]
        <dev-python/packaging-25.0[${PYTHON_USEDEP}]
        >=dev-python/psutil-5.5.1[${PYTHON_USEDEP}]
+       <dev-python/psutil-8.0.0[${PYTHON_USEDEP}]
        >=dev-python/redis-4.5.0[${PYTHON_USEDEP}]
        >=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}]
        <dev-python/python-gnupg-0.6.0[${PYTHON_USEDEP}]
        >=dev-python/paho-mqtt-1.6[${PYTHON_USEDEP}]
        <dev-python/paho-mqtt-3[${PYTHON_USEDEP}]
-       >=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}]
        net-libs/paho-mqtt-c
        app-misc/mosquitto
 "
@@ -45,10 +41,6 @@ RDEPEND="
        notus? ( >=net-analyzer/notus-scanner-22.4 )
 "
 
-PATCHES=(
-       "${DISTDIR}/${PN}-22.7.1-add-delay-in-mqtt-test.patch" #934153
-)
-
 distutils_enable_tests unittest
 
 python_compile() {

Reply via email to