commit: 99ec9b75466adf3fb65143554bd0bd461e73b837 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Fri Dec 25 13:25:08 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri Dec 25 13:29:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ec9b75
sys-process/atop: bump to v2.6.0 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> sys-process/atop/Manifest | 1 + sys-process/atop/atop-2.6.0.ebuild | 68 +++++++++++++++++++++++++++ sys-process/atop/files/atop-2.6.0-build.patch | 27 +++++++++++ 3 files changed, 96 insertions(+) diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest index 8c799a1f8b9..12f173f52a4 100644 --- a/sys-process/atop/Manifest +++ b/sys-process/atop/Manifest @@ -4,3 +4,4 @@ DIST atop-2.3.0-version_h.patch 748 BLAKE2B 95aa0e819d35498436ddb2554f457e9bf74a DIST atop-2.3.0.tar.gz 190560 BLAKE2B 4c7a8f33f7e32fb6107275c21db54af91ffdb06cea14039ba85c6e844efc05e5c64708dae48eb3a7b8e075378838937ddd4756a954e6a040d4b3e8c4e7dd9e93 SHA512 8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621 DIST atop-2.4.0.tar.gz 230066 BLAKE2B 75070f0a87f9745f0e018ef5aac7e71060acea77e2043d43594a492875126945ef4c5bfe15f69b300ce6ac25c38f54360ba761ad7fc510016a91b71dc3377957 SHA512 8872626db447b2b7265fa257bc78795c3a5bc2f0dfffae94d01df4090de75feeb092e5a33421877aa12563dde3df18734b5db947c828cec6949284fbeb9dbc8d DIST atop-2.5.0.tar.gz 233835 BLAKE2B e40ae26cb1f8ddecbf6ea8f8f83d09bf9d62003a54e0679d5eefdf7c6fdaaff1940ba5f097fc1fc181ddb6aedcb8e1482feeb451cce5905b98c929c786db147d SHA512 8c50482194b60afedfd9d593ea7e916b63310bd3b43965fbd2769a2673f6f2247dec764ed1576866321a4b9c7301d5d8369c97fb6d351246395d01772ad04489 +DIST atop-2.6.0.tar.gz 242323 BLAKE2B 8cf39c4b18994de26188ad5e19e282bc3ef7693eeff4853386f6b254d1115dbd2308eaa4c6e7620e6081d44037e6ce01356ad72ba25bcf4b1c3e7674768e5c24 SHA512 46cbc1c67ee6683be8dca79bf68d85962a119469ddce4947519cf4fe178b14d54b69451cfaa2b5c0a3f8c9bf8769de619aa5a7768eae34422688c7fc26fe0a58 diff --git a/sys-process/atop/atop-2.6.0.ebuild b/sys-process/atop/atop-2.6.0.ebuild new file mode 100644 index 00000000000..a5c018ec8bc --- /dev/null +++ b/sys-process/atop/atop-2.6.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info 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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + sys-libs/ncurses:0= + >=sys-process/acct-6.6.4-r1 +" +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 + tc-export CC PKG_CONFIG + sed -i 's: root : :' atop.cronsysv || die #191926 + # prefixify + sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die +} + +src_install() { + 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 + 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.6.0-build.patch b/sys-process/atop/files/atop-2.6.0-build.patch new file mode 100644 index 00000000000..b675a16ee36 --- /dev/null +++ b/sys-process/atop/files/atop-2.6.0-build.patch @@ -0,0 +1,27 @@ +--- a/Makefile ++++ b/Makefile +@@ -33,19 +33,19 @@ VERS = $(shell ./atop -V 2>/dev/null| sed -e 's/^[^ ]* //' -e 's/ .*//') + all: atop atopsar atopacctd atopconvert atopcat + + 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) + + clean: + rm -f *.o atop atopacctd atopconvert atopcat +
