gentoo auto-resync : 13:08:2024 - 11:06:03

6 files changed, 187 insertions, 3 deletions

diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index 8d7839e31546..5a9011611012 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -1,12 +1,17 @@
 AUX atop-2.10.0-ldflags.patch 897 BLAKE2B 23e574eccaa4112067f820742f8e110240b6afeaccbec142a7136eabbe72312f78d5216524e1b2608301c3834c4005ca6f77740ff1ae03141863804b5dfed9a3 SHA512 67aa591f824dfe736f0f1bee8c842f2e84a7389ec4589a798b6279bd8563b9bb93e7c6c3fd03d3711a920c97d9312b86988766eb3a2a4f01044b5e52786f1729
 AUX atop-2.10.0-respect-PKG_CONFIG.patch 812 BLAKE2B eb47efa3889f60e384af33b5665d99400bfcc3310b1038879837f45215e0e28eb03fea8ec93ba37dda51fbe4710bfd4bd5c0d6dff7fe695ea95ab5a4dbbbf9b6 SHA512 42cddd3d94fec2908e8dd13280ccbefd055e0456bd87e4f47e1460c44ee3908949c593b92b61922069a86d1b35d2279963739a294534800e84329e8862f7ef7f
 AUX atop-2.10.0-respect-opt.patch 664 BLAKE2B 2b8c691ac67f370d827047bff1220139fd443a65b78d38c2a502ddca28783a43abe4df14943443d94d9b83b08e3ebd128c9edc8583a5c5ef6e24bea6c77d2123 SHA512 9dd5d0425b5220a1838785b93b65f6dab5b9db5b4457de649f39db9320661005f02428f470a9b5328fe513a9ceae08a0aca45fd115daf818611bda628419dd3d
+AUX atop-2.11.0-build.patch 1149 BLAKE2B 68512cc240987461e0cafcb4b96626e975a2d29d75f52fc3362400601d487cd8613c19db949757e03905b030eb5dfba7447aa6db5132407d04493c6a812c2ee9 SHA512 15da444495ba18308af1c875475e584e3c68900eb4a137504b44f95b8ca854e87e6b9f0f88d39a60ddec8c9ce6832dace251df55751d510705249848f1aec327
+AUX atop-2.11.0-respect-opt.patch 647 BLAKE2B 9a5fe18e18c7813ff7e0c5a703f8968466c8a8ec1c9ac8386bc6de03447790f8491c6074856c59e97f6bcde65b3ac5cb2c58563e07588403f0636da9361640cc SHA512 b54a018263b00d68f2ccc26d3d8c3b36940de0b7f94146a21f67f6660890e5279e90c4773c6a926ba124b1342a0083e9d111251609aa36c8b06403d182306142
 AUX atop-2.6.0-build.patch 911 BLAKE2B d67b53d297d2e05ce098eca6e2f99ee2314652755d01671a72bc2501913419461bbafd7f054a58ff62dc90434960cdcbb335e397e6c7316670aca902fcd504d7 SHA512 9798131103ed5d34210a00d0e7fc82f4a50bd5a2c6bc12dc67d6a34192a0bb8bcc38777311d5a6562af9434766b26ad9fc2c4452a8da1b28316a816c3316761d
 AUX atop-2.9.0-netatop-makefile.patch 897 BLAKE2B f1f05008e329ea4b96a6b43336fa5df5356c011f6b5eaf3080766e4314040f0629f58f86e9957f095897079f7490fc954ea1ae2556cf8dd7e948497ccdb4d0b4 SHA512 2bd5988ed31af5a528e351ea58a072a06d7d297c7f89591a8b530e507fc342e2aa762c6344cdd8380affeda1e29bb071aee54e4b20379d5a11e21c797ab8fa80
 AUX netatop.rc 330 BLAKE2B 8da0bdd3ea55cdc0ff9b54d7fd499f6582eb6571a859da8e2e0eefd7b5c47b9c6aac9be5565bd61e8fb03168482cab65e5ecbaf702d56c8e940bfb4c4e38f12f SHA512 e61c8133041da7961088faa90b244ab44cebc07583b3feffa5854b2751fc6bdd1cd8964c30ab9acde653d70f4280738fe9f77f7eaf29d939757dc0b51151f289
 DIST atop-2.10.0.tar.gz 296569 BLAKE2B 8c6e56978cb32e4e80c7344f631d6fd3dd034ff785e6b2db1b80556aaea30a0feeb413704128150ba0d7b1b4eaeb6cb5699a1b2661060ac53c10f7025997418e SHA512 22e39799aa7c090c68d8ac2f02646fb9586122bdb83de9d90bc3119bd290c557faa0489cdc8640fc4fd1f1155c231b1d70dae1b22dc6102ba0327fdd4b5f7029
+DIST atop-2.11.0.tar.gz 322301 BLAKE2B 0084f1c02e835abd69c4810c0ef020d40bd8738064f8b9ae3cb1f24c460507571b87ddf47f12a0b2eefa86f9d0dcce02be8829e157dcc289deaac6d9cd3c7cda SHA512 5cf176e83232a54b69628b165172ed43f7bdfb62c7744ee781da8a262f3e4d70a829dc175320b5042a794a8d31318672477ba870feaaf3e9aa85fd4d6f485356
 DIST atop-2.9.0.tar.gz 282412 BLAKE2B 8531eee3bffabfb3cacdb6bea4c4a1b7ea56da878154a86edd80fb20ddffc5f56248d06c679bd8933c203a0174e97515cfce633a2387bf465399d4203ca857c2 SHA512 f055466c076491a54fc45a482209fd3de60013e7b76af46b65dffe82d220fbd96eb11d5f199aa27e2f7a8754fe3c6509c44bf0dbd6e3099d8f5710944e01cb38
 DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61feeeee6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68
-EBUILD atop-2.10.0-r1.ebuild 2574 BLAKE2B f16ea19bc00ffc72c0c5410253ea89eabcdf13a9e3f2d73ef775cf9c6206c9c700011a36e1288d5c45d1c1b2c7df273fc8615223413bc41dfcd2e31d00f74b40 SHA512 8f0893835be13404f2c63941278f4d177a9723ad7aa9453ad157181972a4e1026558de689f43d16433bf4b422bb09f773315007187e08cdb26341533a293e935
-EBUILD atop-2.9.0-r1.ebuild 2418 BLAKE2B a3da757b84814e21d1d28a50a60b764aab5d2f80131cf73f0a28e4b801893ced689400610a3cb4a5e122cf666e39fdb20cad674f867d5048dd4fc73594d7ac2a SHA512 f907cbacafb923eda3df4a128fa6b0c59589e5f1c497447cd447f0ba2bd5263fb72f7e1febbbe62fbf0d8d84db14ee6e6c16c9b52cd2463c148c7f373a154965
+DIST netatop-3.2.2.tar.gz 23977 BLAKE2B cf360071e56593251df4249d2c7ec8a1c823c71a4d96e5b7f5d02ab0dc8388eb22d34c4120924c5a5ecc9b4d610a14785e5002bc3b888aa4c66d8c73454a0900 SHA512 59ff6daf56f73578cfc7b48085747d3f2917589203196396dde6036c33da0dbce4b67b58c141545a785beb31ebeb35936d96bb6ff3b6071e95315a32e20d6093
+EBUILD atop-2.10.0-r1.ebuild 2756 BLAKE2B b89a5829f563ab2ad0017e0c027d178fdb2d61328f76ac5e10091d5fa30e605429409dca89c497f76fb08df1021303df6d6da6af5fd56a238e67500ba5958639 SHA512 3fe3655e53bac30a449b595fe3e2516c364724d0906f403352270b8134d42c62c2a3ab5a79ca3576cef00e87268d8e6aef8f9b4004080a525bc241e81c1d9c60
+EBUILD atop-2.11.0.ebuild 2471 BLAKE2B a0b6984e2fe1c4ced3c4de09b71106409127e1639e3ce40e15989ce86d654b5584d4bd0e3d7dd03554b9b1107716540242ee3d61b65694c9e1b86fdca6eddc67 SHA512 8d1ddbb29ce28c9bf8aba70c236d7bdd49bd9fefdec91242bf11cbf645d1835ba0371d1623c65a0505944f199900bdabc4623b5ce7aae0a368f9a3cf80ab40f7
+EBUILD atop-2.9.0-r1.ebuild 2600 BLAKE2B 3c2a0392684b65059c5183b3a842a072d27a50912bde7fd018a1c4408d0287a7c5ec0512345ecf8904b18c0f040421b2da56e45b962332d3e21c5a7c8b1bdd45 SHA512 9c0ef8fe59ec29977e69199e7ea8fafec8376f737c18c507a6f381485971577f39897385f06eb05339d1c682e462586cf0ebb218ac53716ad216b9d6ae8b08ab
 MISC metadata.xml 438 BLAKE2B 39c4d236c004f4b9856dd64ee810c64f41ec5097c259d2ee51d2e3c01b75d04aeb49d19f25bbb6aba131d4fc31fae9b2f4d3706cb1358ccdc95a4caca9967ca8 SHA512 7dfb13251330c915a8e8373f4f4a58113a5dac2a036e79d9ec9bc72c76ed7756f6706cb01c65b0f77458818485383199747fde1cd935b855e1c08c6f02e3c274
diff --git a/sys-process/atop/atop-2.10.0-r1.ebuild b/sys-process/atop/atop-2.10.0-r1.ebuild
index c9b216bc2e3f..5d3ecf36942a 100644
--- a/sys-process/atop/atop-2.10.0-r1.ebuild
+++ b/sys-process/atop/atop-2.10.0-r1.ebuild
@@ -53,6 +53,14 @@ src_prepare() {
 	if use modules ; then
 		cd "${WORKDIR}"/${NETATOP_P} || die
 		eapply "${FILESDIR}"/${PN}-2.9.0-netatop-makefile.patch
+
+		sed \
+			-e "s#\`uname -r\`#${KV_FULL}#g" \
+			-e "s#\$(shell uname -r)#${KV_FULL}#g" \
+			-i {.,daemon,module}/Makefile || die
+
+		grep -rq "uname -r" && die "found uname calls"
+
 		cd "${S}" || die
 	fi
 
diff --git a/sys-process/atop/atop-2.11.0.ebuild b/sys-process/atop/atop-2.11.0.ebuild
new file mode 100644
index 000000000000..547074271ffe
--- /dev/null
+++ b/sys-process/atop/atop-2.11.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Check on bumps of atop
+# https://www.atoptool.nl/downloadnetatop.php
+NETATOP_VER=3.2.2
+
+# Controls 'netatop' kernel module
+MODULES_OPTIONAL_IUSE="modules"
+NETATOP_P=netatop-${NETATOP_VER}
+NETATOP_S="${WORKDIR}"/${NETATOP_P}
+
+inherit linux-mod-r1 systemd toolchain-funcs
+
+DESCRIPTION="Resource-specific view of processes"
+HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"
+SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
+
+# Module is GPL-2 as well
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-libs/glib
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	>=sys-process/acct-6.6.4-r1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.11.0-build.patch
+	"${FILESDIR}"/${PN}-2.11.0-respect-opt.patch
+)
+
+pkg_pretend() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~BSD_PROCESS_ACCT"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use modules ; then
+		cd "${WORKDIR}"/${NETATOP_P} || die
+
+		sed \
+			-e "s#\`uname -r\`#${KV_FULL}#g" \
+			-e "s#\$(shell uname -r)#${KV_FULL}#g" \
+			-i Makefile || die
+
+		grep -rq "uname -r" && die "found uname calls"
+
+		cd "${S}" || die
+	fi
+
+	tc-export CC PKG_CONFIG
+
+	# bug #191926
+	sed -i 's: root : :' atop.cronsysv || die
+
+	# Prefixify
+	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
+}
+
+src_compile() {
+	default
+
+	local modlist=( "netatop=:../${NETATOP_P}::netatop.ko" )
+	linux-mod-r1_src_compile
+
+	if use modules ; then
+		# Don't let the Makefile try to build the module for us
+		emake -C "${NETATOP_S}" netatopd
+	fi
+}
+
+src_install() {
+	linux-mod-r1_src_install
+
+	if use modules ; then
+		dosbin "${NETATOP_S}"/netatopd
+		doman "${NETATOP_S}"/man/*
+
+		systemd_dounit "${NETATOP_S}"/netatop.service
+
+		newinitd "${NETATOP_S}"/netatop.rc netatop
+	fi
+
+	emake DESTDIR="${D}" genericinstall
+
+	# useless -${PV} copies ?
+	rm "${ED}"/usr/bin/atop*-${PV} || die
+
+	newinitd atop.rc.openrc ${PN}
+	newinitd atopacct.rc.openrc atopacct
+
+	systemd_dounit "${S}"/${PN}.service
+	systemd_dounit "${S}"/atopacct.service
+
+	dodoc atop.cronsysv AUTHORS README
+
+	exeinto /usr/share/${PN}
+	doexe ${PN}.daily
+
+	insinto /etc/default
+	newins ${PN}{.default,}
+
+	keepdir /var/log/${PN}
+}
diff --git a/sys-process/atop/atop-2.9.0-r1.ebuild b/sys-process/atop/atop-2.9.0-r1.ebuild
index 313f9ab42b41..6b72dd2f4521 100644
--- a/sys-process/atop/atop-2.9.0-r1.ebuild
+++ b/sys-process/atop/atop-2.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -49,6 +49,14 @@ src_prepare() {
 	if use modules ; then
 		cd "${WORKDIR}"/${NETATOP_P} || die
 		eapply "${FILESDIR}"/${PN}-2.9.0-netatop-makefile.patch
+
+		sed \
+			-e "s#\`uname -r\`#${KV_FULL}#g" \
+			-e "s#\$(shell uname -r)#${KV_FULL}#g" \
+			-i {.,daemon,module}/Makefile || die
+
+		grep -rq "uname -r" && die "found uname calls"
+
 		cd "${S}" || die
 	fi
 
diff --git a/sys-process/atop/files/atop-2.11.0-build.patch b/sys-process/atop/files/atop-2.11.0-build.patch
new file mode 100644
index 000000000000..37d262a553f9
--- /dev/null
+++ b/sys-process/atop/files/atop-2.11.0-build.patch
@@ -0,0 +1,35 @@
+From 26a85b778ecf45989347ddee256af65f9b26747d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 11 Aug 2024 22:04:15 +0100
+Subject: [PATCH] foo
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile
++++ b/Makefile
+@@ -35,19 +35,19 @@ VERS     = $(shell ./atop -V 2>/dev/null| sed -e 's/^[^ ]* //' -e 's/ .*//')
+ all: 		atop atopsar atopacctd atopconvert atopcat atophide
+ 
+ atop:		atop.o    $(ALLMODS) Makefile
+-		$(CC) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS)
++		$(CC) $(CFLAGS) atop.o $(ALLMODS) -o atop $(shell ${PKG_CONFIG} --libs ncurses) -lz -lm -lrt $(LDFLAGS)
+ 
+ atopsar:	atop
+ 		ln -sf atop atopsar
+ 
+ atopacctd:	atopacctd.o netlink.o
+-		$(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
++		$(CC) $(CFLAGS) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
+ 
+ atopconvert:	atopconvert.o
+-		$(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
++		$(CC) $(CFLAGS) atopconvert.o -o atopconvert -lz $(LDFLAGS)
+ 
+ atopcat:	atopcat.o
+-		$(CC) atopcat.o -o atopcat $(LDFLAGS)
++		$(CC) $(CFLAGS) atopcat.o -o atopcat $(LDFLAGS)
+ 
+ atophide:	atophide.o
+ 		$(CC) atophide.o -o atophide -lz $(LDFLAGS)
+-- 
+2.45.2
+
diff --git a/sys-process/atop/files/atop-2.11.0-respect-opt.patch b/sys-process/atop/files/atop-2.11.0-respect-opt.patch
new file mode 100644
index 000000000000..e768299c011a
--- /dev/null
+++ b/sys-process/atop/files/atop-2.11.0-respect-opt.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,7 @@ PMPATH2  = /usr/lib64/pm-utils/sleep.d
+ PMPATHD  = /usr/lib/systemd/system-sleep
+ 
+ PKG_CONFIG ?= pkg-config
+-CFLAGS  += -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
++CFLAGS  += -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0)
+ OBJMOD0  = version.o
+ OBJMOD1  = various.o  deviate.o   procdbase.o