gentoo auto-resync : 23:04:2023 - 00:06:15

6 files changed, 0 insertions, 193 deletions

diff --git a/sys-process/iotop/Manifest b/sys-process/iotop/Manifest
index ca8c2a075829..9f7761dcae64 100644
--- a/sys-process/iotop/Manifest
+++ b/sys-process/iotop/Manifest
@@ -1,9 +1,3 @@
-AUX iotop-0.6-Actually-skip-invalid-lines-in-proc-status.patch 896 BLAKE2B 854d249c2d9308d2fc5cb2371d402ea7ddeff04af378e909616d920a45aa2f4409e6a15c9c8e261d192f580b22c8e51190d3abeaf9bbe68c5a6d196f65c2b5df SHA512 15efbc86ceefa464aa315baf6f43188003788e8507c6d614ef00557da3fe280c77fdc368347d8e4389423d3d9797346a6e602282229c93229717bf6cd6784de7
-AUX iotop-0.6-Ignore-invalid-lines-in-proc-status-files.patch 2826 BLAKE2B bef789782f496e840cc89be232399d495b3e77886b031c6ccdc78ecc71cdcb8585fe39a9164b2eeee6219f62bf97a7038f48a60de66529cd8bd5fd0c0ccceafa SHA512 ff09ac51be530f6d1f5b21101c2a501563afb021f943c74f7965fd9a8ee35a1dfb6842b1055fc3afdf8c2b5533a4a49ad5b12d24ce12c605a581db30d1e62437
-AUX iotop-0.6-Only-split-proc-status-lines-on-the-character.patch 984 BLAKE2B c43a4feaa7293b86454a96aaddbbc3c40c6a2afc2656448cc899230abc479d702adbc5785a818754214f7524bc499f4699ac1c841b7753601c9bcd89771440ec SHA512 291ed55dcebd988e0819f28805f12392bfff3ea0686cddebdb9bec8042f981c2d94c7ac3f8d9a4ba5e8611686129c47347bd1a9484ce82a2687c651007efb937
-AUX iotop-0.6-setup.py3.patch 1151 BLAKE2B da00d36a1778173e2d77041fec584aa1ff42062932915ff2a6beb9aaeda0699fdb6a6c9903eee56e10efb9ed9d6def08a8d7fbbe714def4e8bff4504500aa55e SHA512 6b97da5ef9e78c268193ce0270328f4c4d99d30f532fe68dac9bd033bb0a5e6cdb3145b53a7670c7babdae7f170473d1f9eb23137b5950fdaceadde266b4bb73
-DIST iotop-0.6.tar.bz2 29779 BLAKE2B 6c979f7beef4e9ec6536eb5ec113ab7089ccb0b8b00dfca6181408390584dac0eae18b110c3f4837a25defd7ab2c2e9d79f1f5cad762f97519e94847951f0037 SHA512 b1047da3bc46604447cc8ab22442a3a5381e1a79a6b176fe9ee8402ee5cebb959205407a6aeaffccccde9d2f67624ff8ee6717b051838f13ab88bf3a16db3ab9
 DIST iotop-0.6_p20230124.tar.gz 28751 BLAKE2B 4fd281b663288825a3315442171df649b59a133479732367863e4f0d75f81e760af5117aec7b1ff070bb7a98e7348f76a6490b9ab8866c0ff7cb52073b07fbd8 SHA512 916809c9a97ed260525b00b4e6bd1f55f07b307bf1dc2f61e87317014d04e1bb3fab03c9ad9d5c110d198fbc89427cbe9e6679f03785f71e7e572f985dbac2a7
-EBUILD iotop-0.6.ebuild 987 BLAKE2B 2194469ff0bb7858611c7c7ffa57cd2df933219a777abd10c0607d09be51e36dc06f988dda4cf17dedc1f7439d5fbe1aed8454caed4c432a9c816030707c16a2 SHA512 997b2f7f373c678df96f7e40c774031e025121e24222bb5e798702ab7fe7896974da1ae49f8a31d0338dfe43d7ba79c42a59a70fde0791e845e04e5fb4d145a7
 EBUILD iotop-0.6_p20230124.ebuild 1139 BLAKE2B 68bc1463e7dda8ca0828385033b1c95348bcd262c0ca0bf52f3287c69a7f0c1ae1179ca327af3bc02efb94db6a9f98791b907b86e88236f641b442600f9b2123 SHA512 40785acbb5d3e80eb459573b844ed06ed4ac89c007fa739a1d93df44944701d4d15fd5af4cbae11be6e71640de1375450bb3a007e181d752e069113aa296aca8
 MISC metadata.xml 360 BLAKE2B 7d33d33cef4bf209ff0b3a487cfd95d89f2143f1f300ad8984a414d19d016c8bfc06433cc6d2bce662c04e97659391e113d45fccd9d1b51c3409969d94a70cc3 SHA512 f89ebbe23e0d3ca111fde959b313c09e49c4daaea2cc433dc3424cbf90f9a4d7e2b4bf6019edf95345a053d437aa1d8809cd22e9ce5fe030967ee3befa428692
diff --git a/sys-process/iotop/files/iotop-0.6-Actually-skip-invalid-lines-in-proc-status.patch b/sys-process/iotop/files/iotop-0.6-Actually-skip-invalid-lines-in-proc-status.patch
deleted file mode 100644
index 9dc89bfb6f33..000000000000
--- a/sys-process/iotop/files/iotop-0.6-Actually-skip-invalid-lines-in-proc-status.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7c51ce0e29bd135c216f18e18f0c4ab769af0d6f Mon Sep 17 00:00:00 2001
-From: Paul Wise <pabs3@bonedaddy.net>
-Date: Fri, 25 May 2018 15:20:44 +0800
-Subject: [PATCH 2/2] Actually skip invalid lines in /proc/*/status
-
-Fixes: commit 0392b205b5c3973a326721c2e9f97f0fa2eefa82
----
- iotop/data.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/iotop/data.py b/iotop/data.py
-index e0387f0..3874974 100644
---- a/iotop/data.py
-+++ b/iotop/data.py
-@@ -214,7 +214,7 @@ def parse_proc_pid_status(pid):
-                 # Ignore lines that are not formatted correctly as
-                 # some downstream kernels may have weird lines and
-                 # the needed fields are probably formatted correctly.
--                pass
-+                continue
-             result_dict[key] = value.strip()
-     except IOError:
-         pass  # No such process
--- 
-2.20.1.97.g81188d93c3-goog
-
diff --git a/sys-process/iotop/files/iotop-0.6-Ignore-invalid-lines-in-proc-status-files.patch b/sys-process/iotop/files/iotop-0.6-Ignore-invalid-lines-in-proc-status-files.patch
deleted file mode 100644
index df46caf4ce11..000000000000
--- a/sys-process/iotop/files/iotop-0.6-Ignore-invalid-lines-in-proc-status-files.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0392b205b5c3973a326721c2e9f97f0fa2eefa82 Mon Sep 17 00:00:00 2001
-From: Paul Wise <pabs3@bonedaddy.net>
-Date: Fri, 25 May 2018 15:13:26 +0800
-Subject: [PATCH 1/2] Ignore invalid lines in /proc/*/status files
-
-One Ubuntu Linux kernel security fix introduced a blank line.
-Some other Linux kernels may have invalid lines in the future.
-
-See-also: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1772671
-Fixes: https://bugs.launchpad.net/ubuntu/+source/iotop/+bug/1772856
-Reported-by: Paul Jaros <jaros.paul@gmail.com>
-Reported-in: <CAEh_nc0_DXTmfu16PxmVyrCi6QQeSrpnGGhtfNu60wJYfa_6Zw@mail.gmail.com>
-Traceback (most recent call last):
-  File "/usr/sbin/iotop", line 17, in <module>
-    main()
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 620, in main
-    main_loop()
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 610, in <lambda>
-    main_loop = lambda: run_iotop(options)
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 508, in run_iotop
-    return curses.wrapper(run_iotop_window, options)
-  File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper
-    return func(stdscr, *args, **kwds)
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 501, in run_iotop_window
-    ui.run()
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 155, in run
-    self.process_list.duration)
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 434, in refresh_display
-    lines = self.get_data()
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 415, in get_data
-    return list(map(format, processes))
-  File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 388, in format
-    cmdline = p.get_cmdline()
-  File "/usr/lib/python2.7/dist-packages/iotop/data.py", line 292, in get_cmdline
-    proc_status = parse_proc_pid_status(self.pid)
-  File "/usr/lib/python2.7/dist-packages/iotop/data.py", line 196, in parse_proc_pid_status
-    key, value = line.split(':\t', 1)
-ValueError: need more than 1 value to unpack
----
- iotop/data.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/iotop/data.py b/iotop/data.py
-index 115bb8f..e0387f0 100644
---- a/iotop/data.py
-+++ b/iotop/data.py
-@@ -208,7 +208,13 @@ def parse_proc_pid_status(pid):
-     result_dict = {}
-     try:
-         for line in open('/proc/%d/status' % pid):
--            key, value = line.split(':', 1)
-+            try:
-+                key, value = line.split(':', 1)
-+            except ValueError:
-+                # Ignore lines that are not formatted correctly as
-+                # some downstream kernels may have weird lines and
-+                # the needed fields are probably formatted correctly.
-+                pass
-             result_dict[key] = value.strip()
-     except IOError:
-         pass  # No such process
--- 
-2.20.1.97.g81188d93c3-goog
-
diff --git a/sys-process/iotop/files/iotop-0.6-Only-split-proc-status-lines-on-the-character.patch b/sys-process/iotop/files/iotop-0.6-Only-split-proc-status-lines-on-the-character.patch
deleted file mode 100644
index ae8540f9da9f..000000000000
--- a/sys-process/iotop/files/iotop-0.6-Only-split-proc-status-lines-on-the-character.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7814f30a5ed65acd07f284bba991ca557788ee80 Mon Sep 17 00:00:00 2001
-From: Paul Wise <pabs3@bonedaddy.net>
-Date: Thu, 28 Jul 2016 13:25:54 +0800
-Subject: [PATCH] Only split /proc/*/status lines on the : character.
-
-Apparently vserver kernels have some lines that don't
-appear to have the tab character so iotop crashes.
-
-The tab character will be stripped by the next code line.
-
-Closes: https://bugs.gentoo.org/show_bug.cgi?id=458556
----
- iotop/data.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/iotop/data.py b/iotop/data.py
-index c4e961e..d18ca9d 100644
---- a/iotop/data.py
-+++ b/iotop/data.py
-@@ -197,7 +197,7 @@ def parse_proc_pid_status(pid):
-     result_dict = {}
-     try:
-         for line in open('/proc/%d/status' % pid):
--            key, value = line.split(':\t', 1)
-+            key, value = line.split(':', 1)
-             result_dict[key] = value.strip()
-     except IOError:
-         pass  # No such process
--- 
-2.20.1.97.g81188d93c3-goog
-
diff --git a/sys-process/iotop/files/iotop-0.6-setup.py3.patch b/sys-process/iotop/files/iotop-0.6-setup.py3.patch
deleted file mode 100644
index 5844d86cb1ba..000000000000
--- a/sys-process/iotop/files/iotop-0.6-setup.py3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 98a5985e52e7041eb96c80dd95fd5c70634f5ee7 Mon Sep 17 00:00:00 2001
-Message-Id: <98a5985e52e7041eb96c80dd95fd5c70634f5ee7.1371536396.git.jlec@gentoo.org>
-From: Justin Lecher <jlec@gentoo.org>
-Date: Tue, 18 Jun 2013 08:19:28 +0200
-Subject: [PATCH] Make setp.py compatible with python3
-
-Dictionaries in python 3 do not contain the itervalues() method anymore.
-The values() method should be used and can also safely applied for
-python 2.
-
-Signed-off-by: Justin Lecher <jlec@gentoo.org>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 7150102..9de6068 100755
---- a/setup.py
-+++ b/setup.py
-@@ -7,7 +7,7 @@ from iotop.version import VERSION
- # Dirty hack to make setup.py install the iotop script to sbin/ instead of bin/
- # while still honoring the choice of installing into local/ or not.
- if hasattr(distutils_install, 'INSTALL_SCHEMES'):
--    for d in distutils_install.INSTALL_SCHEMES.itervalues():
-+    for d in distutils_install.INSTALL_SCHEMES.values():
-         if d.get('scripts', '').endswith('/bin'):
-             d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin'
- 
--- 
-1.8.2.1
-
diff --git a/sys-process/iotop/iotop-0.6.ebuild b/sys-process/iotop/iotop-0.6.ebuild
deleted file mode 100644
index ddda92f971fe..000000000000
--- a/sys-process/iotop/iotop-0.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="ncurses(+)"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="Top-like UI used to show which process is using the I/O"
-HOMEPAGE="http://guichaz.free.fr/iotop/"
-SRC_URI="http://guichaz.free.fr/iotop/files/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="!sys-process/iotop-c"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
-
-DOCS=( NEWS README THANKS ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-setup.py3.patch
-	"${FILESDIR}"/${P}-Only-split-proc-status-lines-on-the-character.patch
-	"${FILESDIR}"/${P}-Ignore-invalid-lines-in-proc-status-files.patch
-	"${FILESDIR}"/${P}-Actually-skip-invalid-lines-in-proc-status.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-}