gentoo resync : 22.12.2021

6 files changed, 196 insertions, 5 deletions

diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index 0837d1b05ef1..e09e37340127 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -1,8 +1,14 @@
 AUX atop-2.6.0-build.patch 911 BLAKE2B d67b53d297d2e05ce098eca6e2f99ee2314652755d01671a72bc2501913419461bbafd7f054a58ff62dc90434960cdcbb335e397e6c7316670aca902fcd504d7 SHA512 9798131103ed5d34210a00d0e7fc82f4a50bd5a2c6bc12dc67d6a34192a0bb8bcc38777311d5a6562af9434766b26ad9fc2c4452a8da1b28316a816c3316761d
+AUX atop-2.7.0-netatop-makefile.patch 901 BLAKE2B 8bd0550e117f6bb8b9143b910681817096f6449fa6143f04378bf86a2ed990eec862af8199044496d659b14f01cff1e56be41741e4102c10ee2ccae4ef4f2106 SHA512 46c034f9ee9b743811f54f7afbc88a72c8ef8f768f749841a52cea3502efcbafe6b04e21045823028599d88984cbbf03ec26eef90592a4c3d6b53296c80b7937
 AUX atop.rc-r2 268 BLAKE2B d0673e73ee13d7ac5f1c31544f8f9ba8aefe14c2ebf4e90b090d5a64a308bdd2e42b4131ea5c931e9e2f2386139343cfceb7c04c1378ebd3a260a5d55d0dd5b6 SHA512 07699f1190faa3a8343314b5c8419e7ea49280fef664334f03558907eb5654bc33c7f4baa3fa54cc6f07866c378c984ff81e020e69f0b146c68b8503ab010d0c
 AUX atop.service 190 BLAKE2B 905a7b42d38b3ab25916c90d7b50c52721f9b061c99e8ce5b9d8cc6c452d1dfeba5478389471778e2a988fd058301bae001139c1396bd9c4a76f2b7f79968377 SHA512 194e9703f34b6a1c749ed5bae3e8708dc625d30e174e285a0998c8aa0d2b1b34da70a3d1db86380abc40615b28a5bdb37b2d511be983da5fd7f154b9686ba343
+AUX atop.service-r1 196 BLAKE2B 33a0368e0e2c8c3de62ac58e5214099165dd0a68501a497412bbc95d4e9390952376066dcc0ba34f25142a0638cd0afbf0d462f9273dabbb86923fd760505e85 SHA512 3398bdcd9cd544bbf3837cade7b38fb2bab04d423433df389cc3403d9a3fa2c322a24454200cfe0a2b99316e97470d0fadf702285d3e21a7b0a056f518ca761a
 AUX atopacct.rc 1054 BLAKE2B 80f301506d805ae54552f088c53bf18cab1ee52b76a37387500176e61eba317059b10c9955d13ac5718547253401ec21f0add4b189e5d04ff724af43c8c50b73 SHA512 ddb026c4ebf63dccc6f49b2b7db829d7ba0388da080a65562bac3f2d7ebacc95093099a0fc9d636af5462ace4a9e118eacfe3eb626a70245e7c5c1e874866f02
 AUX atopacct.service 269 BLAKE2B 8cf88201ecb08da441cd066c0d6974afbae41018a5b2ef9c6b1b805d5be53f2bc5849dafe1d0e2d996e3598ed1baa93e3a0e559fe33c11c55bf64345af5c2bab SHA512 1e57eb76db3e78be504a1a11a479d154239f269da5f5cd3a52eced4ca63ea051d003f14d498d9a71070b7081b2ff80f5eeb5453b81952ee0e4c05423e3c2d308
+AUX netatop.rc 330 BLAKE2B 8da0bdd3ea55cdc0ff9b54d7fd499f6582eb6571a859da8e2e0eefd7b5c47b9c6aac9be5565bd61e8fb03168482cab65e5ecbaf702d56c8e940bfb4c4e38f12f SHA512 e61c8133041da7961088faa90b244ab44cebc07583b3feffa5854b2751fc6bdd1cd8964c30ab9acde653d70f4280738fe9f77f7eaf29d939757dc0b51151f289
 DIST atop-2.6.0.tar.gz 242323 BLAKE2B 8cf39c4b18994de26188ad5e19e282bc3ef7693eeff4853386f6b254d1115dbd2308eaa4c6e7620e6081d44037e6ce01356ad72ba25bcf4b1c3e7674768e5c24 SHA512 46cbc1c67ee6683be8dca79bf68d85962a119469ddce4947519cf4fe178b14d54b69451cfaa2b5c0a3f8c9bf8769de619aa5a7768eae34422688c7fc26fe0a58
+DIST atop-2.7.0.tar.gz 248294 BLAKE2B 94587d1ea07fcbbc8b267b96d0e7aa89b04cef9b39ccae0057bfb6163b15b8fdf3ddc9edb377bf40f48f60b4dd29feaf64201b1fd8c396dfb34c610772bc629c SHA512 2b3a1fbbd01728228df9ab1b6a99458fa0f962cc945b198a79298152ff115f6131fdb86fc806fc647a28d86e6e1a56375ca9d4dc530e082a122cf6ffba3dac7b
+DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61feeeee6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68
 EBUILD atop-2.6.0.ebuild 1398 BLAKE2B fdfcfea38505599ac89a61e1964c24ca703fb7dfb9a43951ed2a22ba95498e811512571316d4afa16fb7bd6a9da3f23162ecbcd7d2a5e8e320c1a605cb5dd10e SHA512 828aa1ac766b4ce20b43ca24f012ae6126676509cddf468e3d6770970625ba3a43e8b46244e2b834bbb9eee42abf59b0f130b8f1b6c2e48b7ffdd9c197348d63
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+EBUILD atop-2.7.0.ebuild 2471 BLAKE2B 81e3292449b8ac29d57fdcba3bf01daa28f475e40fd2f58129115bee19738bad2df766ffdef3d76e537cbccb421422925e1c2fe340b603fd07df42d898c79385 SHA512 7fa7e766e56102b133171c92ffb6e0810e38462c26234fa37ce5a068270d9d95c3890696fadc9849a11552d6a9e7a9e24b49928fb878bd1ee1fcc3e8f043d704
+MISC metadata.xml 360 BLAKE2B 38d37fb6b73b08edc31ad159e83b2e90249b8757e13149cef2b9e2d88c0ad8cecfbb3f5590d4bf608ba19fbaca1ac8ecde69924f11550c4ceb99cd8dab0022d2 SHA512 1449de44adf2ca9a31b38de0a0d955c2e30d689f991d1de696bab46ecfc854d5690a57d879c7634d35430cf716766036a9f09c556ff4b6ce5fcd082c4e690a61
diff --git a/sys-process/atop/atop-2.7.0.ebuild b/sys-process/atop/atop-2.7.0.ebuild
new file mode 100644
index 000000000000..224879742c4a
--- /dev/null
+++ b/sys-process/atop/atop-2.7.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Check on bumps of atop
+# https://www.atoptool.nl/downloadnetatop.php
+NETATOP_VER=3.1
+
+# Controls 'netatop' kernel module
+MODULES_OPTIONAL_USE="modules"
+NETATOP_P=net${PN}-${NETATOP_VER}
+NETATOP_S="${WORKDIR}"/${NETATOP_P}
+
+inherit linux-info linux-mod 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="sys-libs/ncurses:0=
+	>=sys-process/acct-6.6.4-r1
+	modules? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-build.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
+		eapply -p1 "${FILESDIR}"/${PN}-2.7.0-netatop-makefile.patch
+		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_configure() {
+	default
+
+	BUILD_TARGETS="netatop.ko"
+	MODULE_NAMES="netatop(:${NETATOP_S}/module)"
+}
+
+src_compile() {
+	default
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	if use modules ; then
+		# netatop's Makefile tries to build the kernel module for us
+		# so let's just replicate parts of it here.
+		emake -C "${NETATOP_S}"/daemon all
+
+		dosbin "${NETATOP_S}"/daemon/netatopd
+		doman "${NETATOP_S}"/man/*
+
+		systemd_dounit "${NETATOP_S}"/netatop.service
+
+		# TODO: openrc init script
+		#install -T -m 0755 netatop.init /etc/init.d/netatop
+	fi
+
+	emake DESTDIR="${D}" genericinstall
+
+	# useless -${PV} copies ?
+	rm "${ED}"/usr/bin/atop*-${PV} || die
+
+	newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
+	newinitd "${FILESDIR}"/atopacct.rc atopacct
+
+	systemd_dounit "${FILESDIR}"/${PN}.service-r1
+	systemd_dounit "${FILESDIR}"/atopacct.service
+
+	dodoc atop.cronsysv AUTHOR README
+
+	exeinto /usr/share/${PN}
+	doexe ${PN}.daily
+
+	insinto /etc/default
+	newins ${PN}{.default,}
+
+	keepdir /var/log/${PN}
+}
diff --git a/sys-process/atop/files/atop-2.7.0-netatop-makefile.patch b/sys-process/atop/files/atop-2.7.0-netatop-makefile.patch
new file mode 100644
index 000000000000..bd2f17658cf8
--- /dev/null
+++ b/sys-process/atop/files/atop-2.7.0-netatop-makefile.patch
@@ -0,0 +1,42 @@
+--- a/daemon/Makefile
++++ b/daemon/Makefile
+@@ -6,7 +6,7 @@
+ all:		netatopd
+ 
+ netatopd:	netatopd.o Makefile
+-		$(CC) netatopd.o -o netatopd -lz
++		$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) netatopd.o -o netatopd -lz
+ 
+ clean:
+ 		rm -f *.o netatopd
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ all:
+ 		./mkversion
+-		cd module; make
+-		cd daemon; make
++		cd module; $(MAKE)
++		cd daemon; $(MAKE)
+ 
+ install:	module/netatop.ko daemon/netatopd
+ 		install -d /lib/modules/`uname -r`/extra
+@@ -14,5 +14,5 @@
+ 		install man/netatopd.8 -t /usr/share/man/man8
+ 
+ clean:
+-		cd module; make clean
+-		cd daemon; make clean
++		cd module; $(MAKE) clean
++		cd daemon; $(MAKE) clean
+--- a/module/Makefile
++++ b/module/Makefile
+@@ -7,7 +7,7 @@
+ 
+ $(MYMODULE).ko: $(MYMODULE).c 
+ 		echo start the make
+-		make -C $(KERNDIR) M=$(THISDIR) modules
++		$(MAKE) -C $(KERNDIR) M=$(THISDIR) modules
+ 
+ clean:
+ 	rm -f *.o *.ko
diff --git a/sys-process/atop/files/atop.service-r1 b/sys-process/atop/files/atop.service-r1
new file mode 100644
index 000000000000..ba1575ba835e
--- /dev/null
+++ b/sys-process/atop/files/atop.service-r1
@@ -0,0 +1,11 @@
+[Unit]
+Description=Atop advanced performance monitor
+Documentation=man:atop(1)
+
+[Service]
+Type=simple
+ExecStart=/usr/share/atop/atop.daily
+KillSignal=SIGUSR2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-process/atop/files/netatop.rc b/sys-process/atop/files/netatop.rc
new file mode 100644
index 000000000000..9f02fab4bcd3
--- /dev/null
+++ b/sys-process/atop/files/netatop.rc
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+command="/usr/sbin/netatopd"
+procname="netatopd"
+
+depend() {
+        before atop atopacct
+}
+
+start_pre() {
+        modprobe netatop > /dev/null 2>&1
+}
+
+stop_post() {
+        rmmod netatop > /dev/null 2>&1
+}
diff --git a/sys-process/atop/metadata.xml b/sys-process/atop/metadata.xml
index 73dda144f9ac..cbd6bd78916c 100644
--- a/sys-process/atop/metadata.xml
+++ b/sys-process/atop/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="modules">Build netatop kernel module and install netatopd daemon.</flag>
+	</use>
 </pkgmetadata>