Re: [PR PATCH] [Updated] alternative iotop

[dmarto <dmarto@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 798 bytes --]

There is an updated pull request by dmarto against master on the void-packages repository

https://github.com/dmarto/void-packages iotop
https://github.com/void-linux/void-packages/pull/36086

alternative iotop
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

Not sure, if I handled the `alternatives` correctly, so I am open to suggestions; I have tested switching back-and-forth and using both with no issues.

A patch file from https://github.com/void-linux/void-packages/pull/36086.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iotop-36086.patch --]
[-- Type: text/x-diff, Size: 2703 bytes --]

From 0ebb791d0bab51e57a582790529fcb485ac2623d Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Fri, 11 Mar 2022 02:23:01 +0200
Subject: [PATCH 1/2] iotop: introduce alternatives support, switch to upstream
 distfile

---
 srcpkgs/iotop/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template
index 7119d9420dcb..9ce0324430c0 100644
--- a/srcpkgs/iotop/template
+++ b/srcpkgs/iotop/template
@@ -1,18 +1,24 @@
 # Template file for 'iotop'
 pkgname=iotop
 version=0.6
-revision=9
+revision=10
 build_style=python3-module
 hostmakedepends="python3"
 depends="${hostmakedepends}"
-short_desc="View I/O usage of processes"
+short_desc="View I/O usage of processes; the original iotop"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="http://guichaz.free.fr/iotop"
-#distfiles="http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"
-distfiles="https://void.johnnynator.dev/iotop-0.6.tar.bz2"
+distfiles="http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"
 checksum=3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b
+alternatives="
+ iotop:iotop:/usr/bin/py-iotop
+ iotop:iotop.8:/usr/share/man/man8/py-iotop.8
+"
 
 post_install() {
-	chmod 644 ${DESTDIR}/usr/share/man/man8/iotop.8
+	mv ${DESTDIR}/usr/bin/{iotop,py-iotop}
+	mv ${DESTDIR}/usr/share/man/man8/{iotop.8,py-iotop.8}
+
+	chmod 644 ${DESTDIR}/usr/share/man/man8/py-iotop.8
 }

From 561fed67487d5fa75a70b9c9624f00ac77cf096a Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Fri, 11 Mar 2022 02:24:19 +0200
Subject: [PATCH 2/2] New package: c-iotop-1.21

---
 srcpkgs/c-iotop/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/c-iotop/template

diff --git a/srcpkgs/c-iotop/template b/srcpkgs/c-iotop/template
new file mode 100644
index 000000000000..283e097fd786
--- /dev/null
+++ b/srcpkgs/c-iotop/template
@@ -0,0 +1,24 @@
+# Template file for 'c-iotop'
+pkgname=c-iotop
+version=1.21
+revision=1
+wrksrc="iotop-${version}"
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="ncurses-devel"
+short_desc="View I/O usage of processes"
+maintainer="Martin Dimov <martin@dmarto.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/Tomas-M/iotop"
+distfiles="https://github.com/Tomas-M/iotop/archive/v${version}.tar.gz"
+checksum=90c11f984d5fdb7471b811c869919548e8aab969b516642ddc30441582cfe776
+alternatives="
+ iotop:iotop:/usr/bin/c-iotop
+ iotop:iotop.8:/usr/share/man/man8/c-iotop.8
+"
+conflicts="iotop<=0.6_9"
+
+do_install() {
+	vman iotop.8 c-iotop.8
+	vbin iotop c-iotop
+}