From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6BADB15808B for ; Sun, 20 Feb 2022 05:27:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B5BAE0824; Sun, 20 Feb 2022 05:27:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E176EE0824 for ; Sun, 20 Feb 2022 05:27:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7CB55343953 for ; Sun, 20 Feb 2022 05:27:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B2B42FE for ; Sun, 20 Feb 2022 05:27:26 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1645334789.a6f5ed8bc85a0ccfb977ec8b10162c066bd4d5a6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/atop/Manifest sys-process/atop/atop-2.7.0-r1.ebuild sys-process/atop/atop-2.7.1.ebuild X-VCS-Directories: sys-process/atop/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a6f5ed8bc85a0ccfb977ec8b10162c066bd4d5a6 X-VCS-Branch: master Date: Sun, 20 Feb 2022 05:27:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 98ba8c87-b902-4b2b-af57-1c766f92ce15 X-Archives-Hash: 44ad73e3443be5423224d8ee049b37ff commit: a6f5ed8bc85a0ccfb977ec8b10162c066bd4d5a6 Author: Sam James gentoo org> AuthorDate: Sun Feb 20 05:15:13 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Feb 20 05:26:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f5ed8b sys-process/atop: drop 2.7.0-r1, 2.7.1 Signed-off-by: Sam James gentoo.org> sys-process/atop/Manifest | 1 - sys-process/atop/atop-2.7.0-r1.ebuild | 111 --------------------------------- sys-process/atop/atop-2.7.1.ebuild | 113 ---------------------------------- 3 files changed, 225 deletions(-) diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest index 5dbf3429dc37..0629516a4ea7 100644 --- a/sys-process/atop/Manifest +++ b/sys-process/atop/Manifest @@ -1,4 +1,3 @@ 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 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.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} -}