gentoo resync : 20.03.2022

5 files changed, 2 insertions, 241 deletions

diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index 618fe8d998d5..bef65544e4d3 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -2,16 +2,12 @@ AUX atop-2.6.0-build.patch 911 BLAKE2B d67b53d297d2e05ce098eca6e2f99ee2314652755
 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 atop-2.7.1.tar.gz 248809 BLAKE2B 2cf1a68a7b24d76340295d9bde03a5602e9049a860468217771c696fe4b9062f2155aeefa2e3e810984780f82de6bf922bf7d6b02c7fd19194162dc70b015b81 SHA512 18f30c67d6f86b9270599317eed846c63d19e8ba6ea85bad8ec3d5ffb0489f17c75c8d8b3a14054bd14e89ed40d39e5d37bce834c7422087e6d8b86c99273a72
 DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61feeeee6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68
 EBUILD atop-2.6.0.ebuild 1398 BLAKE2B fdfcfea38505599ac89a61e1964c24ca703fb7dfb9a43951ed2a22ba95498e811512571316d4afa16fb7bd6a9da3f23162ecbcd7d2a5e8e320c1a605cb5dd10e SHA512 828aa1ac766b4ce20b43ca24f012ae6126676509cddf468e3d6770970625ba3a43e8b46244e2b834bbb9eee42abf59b0f130b8f1b6c2e48b7ffdd9c197348d63
-EBUILD atop-2.7.0-r1.ebuild 2431 BLAKE2B 19ef415ea88b9a7d458229099195f8cd30810e9b62641ac4a68a2e3bcf5761a578a9cbac712ec130b66bc45df8928c6b3f8625327799ed0e7206192146dc3a62 SHA512 a4bccfbbba591214cf97370fb7b6b8f82cbbdf47c63933084e8b4973abc5df92e25b09478acb27e54d8defa3f7ab497b2369c24d06741df0ee133711697c4d28
-EBUILD atop-2.7.1-r1.ebuild 2414 BLAKE2B 9a8afacdba02bba017693c869bcd965e12268f7b830b6d16faf1c792570563355a0819f19f665f4fcb381307cf3a72a2bf820358a9d790066a4b73896314b279 SHA512 4b309d230d1b72a2d24196a6217da34aa02a385cb874cf5dde7b4a92a628643e37fcc1f15e0a017b9bf27da4133089591c71f2515a41a5a3707cbe0affdf3f73
-EBUILD atop-2.7.1.ebuild 2525 BLAKE2B 09f1f7e200eb760b04c90d263a4cb307f425fe121af7a986c7c60df92a781e8378606910a3627bc932639d40eaf5d1892ec6699027d5e7e5549944b74d5dcbc6 SHA512 ff8a9724399d7ef0aa4a7382655cde9e2a814efea93efdd5f263b1008be0c408c22f56e41521edf223f98925147fb5ff5d2cd3cd18eed0a2b2b1ae127a642b37
+EBUILD atop-2.7.1-r1.ebuild 2410 BLAKE2B c18f5c29c904d586563459d392edbda0f6a67baf3a0b24f827a7b2cef97e2ff031c6ac1ff8070e7dec6ff0e6b490020affed5043cc387eeac34d8f7644649914 SHA512 8f302fa0d71d7e2cf3bb889c4ed1706fa3b66c84837994cf7b1fc7903870c6cb4cefc554b268890fb33ac1caacce1cd0a1d1fe5b50e6cbca6d2b36d0f34ea792
 MISC metadata.xml 360 BLAKE2B 38d37fb6b73b08edc31ad159e83b2e90249b8757e13149cef2b9e2d88c0ad8cecfbb3f5590d4bf608ba19fbaca1ac8ecde69924f11550c4ceb99cd8dab0022d2 SHA512 1449de44adf2ca9a31b38de0a0d955c2e30d689f991d1de696bab46ecfc854d5690a57d879c7634d35430cf716766036a9f09c556ff4b6ce5fcd082c4e690a61
diff --git a/sys-process/atop/atop-2.7.0-r1.ebuild b/sys-process/atop/atop-2.7.0-r1.ebuild
deleted file mode 100644
index 4e4a270b83e0..000000000000
--- a/sys-process/atop/atop-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 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
-
-		newinitd "${FILESDIR}"/netatop.rc 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/atop-2.7.1-r1.ebuild b/sys-process/atop/atop-2.7.1-r1.ebuild
index d289c394922e..ee9f7f4ca974 100644
--- a/sys-process/atop/atop-2.7.1-r1.ebuild
+++ b/sys-process/atop/atop-2.7.1-r1.ebuild
@@ -22,7 +22,7 @@ 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"
+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
diff --git a/sys-process/atop/atop-2.7.1.ebuild b/sys-process/atop/atop-2.7.1.ebuild
deleted file mode 100644
index 1adcbe0d802e..000000000000
--- a/sys-process/atop/atop-2.7.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2022 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
-
-		newinitd "${FILESDIR}"/netatop.rc netatop
-	fi
-
-	emake DESTDIR="${D}" genericinstall
-
-	# useless -${PV} copies ?
-	rm "${ED}"/usr/bin/atop*-${PV} || die
-
-	# Note: in the next release (> 2.7.1), switch to upstream files
-	# (ours are now upstreamed)
-	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.service-r1 b/sys-process/atop/files/atop.service-r1
deleted file mode 100644
index ba1575ba835e..000000000000
--- a/sys-process/atop/files/atop.service-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-[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