commit: 32e961ecc79187715d376d6e3fbcfcca404b2760 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Dec 28 04:19:27 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Dec 28 04:19:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e961ec
sys-process/atop: drop 2.7.1-r1, 2.8.1 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-process/atop/Manifest | 2 - sys-process/atop/atop-2.7.1-r1.ebuild | 111 -------------------- sys-process/atop/atop-2.8.1.ebuild | 114 --------------------- .../atop/files/atop-2.7.0-netatop-makefile.patch | 42 -------- 4 files changed, 269 deletions(-) diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest index 9f24cc1ea35e..9aea42ae1dd6 100644 --- a/sys-process/atop/Manifest +++ b/sys-process/atop/Manifest @@ -1,4 +1,2 @@ -DIST atop-2.7.1.tar.gz 248809 BLAKE2B 2cf1a68a7b24d76340295d9bde03a5602e9049a860468217771c696fe4b9062f2155aeefa2e3e810984780f82de6bf922bf7d6b02c7fd19194162dc70b015b81 SHA512 18f30c67d6f86b9270599317eed846c63d19e8ba6ea85bad8ec3d5ffb0489f17c75c8d8b3a14054bd14e89ed40d39e5d37bce834c7422087e6d8b86c99273a72 -DIST atop-2.8.1.tar.gz 264182 BLAKE2B 1764090d760cc8d75d193a077776a269eaa4ba997e8e5f064525d23f2005b92bb1b3f0903f2b1476f437db6a0dc698575e95b34e0fc9112d2ff6d06d3133ea78 SHA512 d748f374fb66d7ce33cebc5ce6899c3c0cc79dc394cb835466b21c7a4ec7c17cba255a3b04b36136c8c24c33ced0e5bd68f151ac804f6176547399e457976aaf DIST atop-2.9.0.tar.gz 282412 BLAKE2B 8531eee3bffabfb3cacdb6bea4c4a1b7ea56da878154a86edd80fb20ddffc5f56248d06c679bd8933c203a0174e97515cfce633a2387bf465399d4203ca857c2 SHA512 f055466c076491a54fc45a482209fd3de60013e7b76af46b65dffe82d220fbd96eb11d5f199aa27e2f7a8754fe3c6509c44bf0dbd6e3099d8f5710944e01cb38 DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61feeeee6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68 diff --git a/sys-process/atop/atop-2.7.1-r1.ebuild b/sys-process/atop/atop-2.7.1-r1.ebuild deleted file mode 100644 index ee9f7f4ca974..000000000000 --- a/sys-process/atop/atop-2.7.1-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 "${S}"/${PN}.service - systemd_dounit "${S}"/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.8.1.ebuild b/sys-process/atop/atop-2.8.1.ebuild deleted file mode 100644 index 09c48a3c4e5c..000000000000 --- a/sys-process/atop/atop-2.8.1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2023 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.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:= - >=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: Release after 2.8.0 may contain this, check! - newinitd "${FILESDIR}"/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/files/atop-2.7.0-netatop-makefile.patch b/sys-process/atop/files/atop-2.7.0-netatop-makefile.patch deleted file mode 100644 index bd2f17658cf8..000000000000 --- a/sys-process/atop/files/atop-2.7.0-netatop-makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- 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
