From abe17cf152eeb7571da8db4b25a30465644a41ba Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 7 Nov 2024 03:03:27 +0000
Subject: gentoo auto-resync : 07:11:2024 - 03:03:27

---
 net-misc/nyx/Manifest                    |  3 ++-
 net-misc/nyx/files/nyx-2.1.0-py311.patch | 13 ++++++++++
 net-misc/nyx/nyx-2.1.0-r6.ebuild         | 38 -----------------------------
 net-misc/nyx/nyx-2.1.0-r7.ebuild         | 41 ++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 39 deletions(-)
 create mode 100644 net-misc/nyx/files/nyx-2.1.0-py311.patch
 delete mode 100644 net-misc/nyx/nyx-2.1.0-r6.ebuild
 create mode 100644 net-misc/nyx/nyx-2.1.0-r7.ebuild

(limited to 'net-misc/nyx')

diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
index 9dc13723b39d..af345093fd77 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,3 +1,4 @@
+AUX nyx-2.1.0-py311.patch 450 BLAKE2B a06bab832c4da84ce125bddc24b06a7d048bbd76061c64219e942a99f6e530893c716b0adc5b850dc0a116376a1e2b1b276ab74a256d0126436a8383fb7e5893 SHA512 2307767f90f339e05c7de6d810e8c4e6ecd740574efd9c1d21bf30a9a0402cdc66a857dbe39f9ec05ec210a904cc2f015d47f6d44c7584c061d6f506e7d04122
 DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37
-EBUILD nyx-2.1.0-r6.ebuild 832 BLAKE2B d256d6a5a4b4afda414c35acb20cae80e63e4d5f4c32da2896c91faed13a6727bf49759716a1e4472b3ded06c6d22b5907039f35b66307f95a49e0a8a9a03d07 SHA512 2f256c180ea34c25450af5325907e8cfe12b515621f4934235861f9f46b8dc7cc9f084afe2f4f10484e333d66baa90b8e405af7b1509d2b3e7e0023daead6fcf
+EBUILD nyx-2.1.0-r7.ebuild 774 BLAKE2B 5e365008c66c6c34ea1b9824e40d6ddbd7787d17d72801f20400c4b7abf8468ca22137d6f31eb5af8aba079b1fa0379fa1edf1ecde686d9da5c32c881ac40cc1 SHA512 f9c720ade61222900219f77b950ed124c130ca1afb1f2e673af32a1649b78c3b4708ded9361eec35ac3b71f605e72ab400b0005f7edb7cc2a3d6ca0f27ea54bb
 MISC metadata.xml 239 BLAKE2B 1fb9280aa15020a1e294df309888ce1474f4adf5c9bed6e57f351fad2020e5a6869773a66acc7c26e5dd6ae3c064929b8c65576476a1e01e8ab05f40a43cd404 SHA512 efe6d1b33faf5158bbae729e022bd2da7c687f26bad4df9bed9a4238e5265e83f39b17d4de66cc7ac492100de8eb2cbd22dd118174c7aafb027c2107617185fd
diff --git a/net-misc/nyx/files/nyx-2.1.0-py311.patch b/net-misc/nyx/files/nyx-2.1.0-py311.patch
new file mode 100644
index 000000000000..71c0bf46e557
--- /dev/null
+++ b/net-misc/nyx/files/nyx-2.1.0-py311.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/942871
+https://github.com/torproject/nyx/issues/74
+--- a/nyx/panel/__init__.py
++++ b/nyx/panel/__init__.py
+@@ -78,7 +78,7 @@
+       is_match = self._key_func(key) if self._key_func else key.match(self.key)
+ 
+       if is_match:
+-        if inspect.getargspec(self._action).args == ['key']:
++        if inspect.getfullargspec(self._action).args == ['key']:
+           self._action(key)
+         else:
+           self._action()
diff --git a/net-misc/nyx/nyx-2.1.0-r6.ebuild b/net-misc/nyx/nyx-2.1.0-r6.ebuild
deleted file mode 100644
index 11c917f7f5e2..000000000000
--- a/net-misc/nyx/nyx-2.1.0-r6.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
-
-PYTHON_COMPAT=( python3_{9..12} pypy3 )
-PYTHON_REQ_USE='ncurses,sqlite(-)'
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to monitor real time Tor status information"
-HOMEPAGE="https://nyx.torproject.org"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.torproject.org/nyx.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-	inherit pypi
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-# net-libs/stem-1.8.0_p20211118 was an incompatible git-snapshot
-# simply depend on net-libs/stem in the future
-RDEPEND="
-	net-libs/stem[${PYTHON_USEDEP}]
-	net-vpn/tor"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# bug #645336
-	doman nyx.1
-}
diff --git a/net-misc/nyx/nyx-2.1.0-r7.ebuild b/net-misc/nyx/nyx-2.1.0-r7.ebuild
new file mode 100644
index 000000000000..c980ee277f0c
--- /dev/null
+++ b/net-misc/nyx/nyx-2.1.0-r7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_REQ_USE='ncurses,sqlite(-)'
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Utility to monitor real time Tor status information"
+HOMEPAGE="https://nyx.torproject.org"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.torproject.org/nyx.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+	inherit pypi
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	net-libs/stem[${PYTHON_USEDEP}]
+	net-vpn/tor
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-py311.patch
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# bug #645336
+	doman nyx.1
+}
-- 
cgit v1.2.3