From f9a1dc6848d79d375374aff0537f151f0a2a3620 Mon Sep 17 00:00:00 2001
From: scimerman <sandi.cimerman@gmail.com>
Date: Mon, 24 Jan 2022 21:07:23 +0100
Subject: [PATCH] htop: updated existing (2.2.0) and added from new official
 repo (3.1.2)

---
 .../h/htop/htop-2.2.0-GCCcore-7.3.0-pbp.eb    |  6 ++-
 .../h/htop/htop-3.1.2-GCCcore-7.3.0.eb        | 37 +++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 easybuild/easyconfigs/h/htop/htop-3.1.2-GCCcore-7.3.0.eb

diff --git a/easybuild/easyconfigs/h/htop/htop-2.2.0-GCCcore-7.3.0-pbp.eb b/easybuild/easyconfigs/h/htop/htop-2.2.0-GCCcore-7.3.0-pbp.eb
index 5c5b17e67de7..828307ac658c 100644
--- a/easybuild/easyconfigs/h/htop/htop-2.2.0-GCCcore-7.3.0-pbp.eb
+++ b/easybuild/easyconfigs/h/htop/htop-2.2.0-GCCcore-7.3.0-pbp.eb
@@ -9,7 +9,7 @@ easyblock = 'ConfigureMake'
 toolchain = {'name': 'GCCcore', 'version': '7.3.0'}
 
 #
-# Complete example URL: 
+# Complete example URL:
 # https://github.com/hishamhm/htop/archive/2.2.0.tar.gz
 ##
 # Apply patch for:
@@ -26,7 +26,8 @@ checksums = [
 ]
 
 builddependencies = [
-    ('Autotools', '20180311')
+    ('Autotools', '20180311'),
+    ('Python', '2.7.16', '-bare'),     # scripts/MakeHeader.py uses Python 2
 ]
 
 dependencies = [
@@ -45,3 +46,4 @@ sanity_check_paths = {
 }
 
 moduleclass = 'tools'
+
diff --git a/easybuild/easyconfigs/h/htop/htop-3.1.2-GCCcore-7.3.0.eb b/easybuild/easyconfigs/h/htop/htop-3.1.2-GCCcore-7.3.0.eb
new file mode 100644
index 000000000000..c126c3d43986
--- /dev/null
+++ b/easybuild/easyconfigs/h/htop/htop-3.1.2-GCCcore-7.3.0.eb
@@ -0,0 +1,37 @@
+easyblock = 'ConfigureMake'
+
+name = 'htop'
+version = '3.1.2'
+
+description = """An interactive, ncursus-based process viewer by Hisham Muhammad."""
+homepage = 'https://github.com/hishamhm/htop'
+
+toolchain = {'name': 'GCCcore', 'version': '7.3.0'}
+
+source_urls = ['https://github.com/htop-dev/%(name)s/archive/']
+sources = ['%(version)s.tar.gz']
+
+checksums = [
+    'fe9559637c8f21f5fd531a4c072048a404173806acbdad1359c6b82fd87aa001',  # htop-3.1.2.tar.gz
+]
+
+builddependencies = [
+    ('Autotools', '20180311')
+]
+
+dependencies = [
+    ('ncurses', '6.1'),
+]
+
+#
+# The source distro does not contain a configure script out of the box:
+# Execute autogen.sh, which calls various tools from the Autotools module to create the configure script.
+#
+preconfigopts = './autogen.sh && chmod a+x configure && '
+
+sanity_check_paths = {
+    'files': ['bin/htop', 'share/man/man1/htop.1'],
+    'dirs': [''],
+}
+
+moduleclass = 'tools'