Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/
Date: Fri, 25 Dec 2020 13:29:35
Message-Id: 1608902962.99ec9b75466adf3fb65143554bd0bd461e73b837.whissi@gentoo
1 commit: 99ec9b75466adf3fb65143554bd0bd461e73b837
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 25 13:25:08 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 25 13:29:22 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ec9b75
7
8 sys-process/atop: bump to v2.6.0
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 sys-process/atop/Manifest | 1 +
14 sys-process/atop/atop-2.6.0.ebuild | 68 +++++++++++++++++++++++++++
15 sys-process/atop/files/atop-2.6.0-build.patch | 27 +++++++++++
16 3 files changed, 96 insertions(+)
17
18 diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
19 index 8c799a1f8b9..12f173f52a4 100644
20 --- a/sys-process/atop/Manifest
21 +++ b/sys-process/atop/Manifest
22 @@ -4,3 +4,4 @@ DIST atop-2.3.0-version_h.patch 748 BLAKE2B 95aa0e819d35498436ddb2554f457e9bf74a
23 DIST atop-2.3.0.tar.gz 190560 BLAKE2B 4c7a8f33f7e32fb6107275c21db54af91ffdb06cea14039ba85c6e844efc05e5c64708dae48eb3a7b8e075378838937ddd4756a954e6a040d4b3e8c4e7dd9e93 SHA512 8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621
24 DIST atop-2.4.0.tar.gz 230066 BLAKE2B 75070f0a87f9745f0e018ef5aac7e71060acea77e2043d43594a492875126945ef4c5bfe15f69b300ce6ac25c38f54360ba761ad7fc510016a91b71dc3377957 SHA512 8872626db447b2b7265fa257bc78795c3a5bc2f0dfffae94d01df4090de75feeb092e5a33421877aa12563dde3df18734b5db947c828cec6949284fbeb9dbc8d
25 DIST atop-2.5.0.tar.gz 233835 BLAKE2B e40ae26cb1f8ddecbf6ea8f8f83d09bf9d62003a54e0679d5eefdf7c6fdaaff1940ba5f097fc1fc181ddb6aedcb8e1482feeb451cce5905b98c929c786db147d SHA512 8c50482194b60afedfd9d593ea7e916b63310bd3b43965fbd2769a2673f6f2247dec764ed1576866321a4b9c7301d5d8369c97fb6d351246395d01772ad04489
26 +DIST atop-2.6.0.tar.gz 242323 BLAKE2B 8cf39c4b18994de26188ad5e19e282bc3ef7693eeff4853386f6b254d1115dbd2308eaa4c6e7620e6081d44037e6ce01356ad72ba25bcf4b1c3e7674768e5c24 SHA512 46cbc1c67ee6683be8dca79bf68d85962a119469ddce4947519cf4fe178b14d54b69451cfaa2b5c0a3f8c9bf8769de619aa5a7768eae34422688c7fc26fe0a58
27
28 diff --git a/sys-process/atop/atop-2.6.0.ebuild b/sys-process/atop/atop-2.6.0.ebuild
29 new file mode 100644
30 index 00000000000..a5c018ec8bc
31 --- /dev/null
32 +++ b/sys-process/atop/atop-2.6.0.ebuild
33 @@ -0,0 +1,68 @@
34 +# Copyright 1999-2020 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=7
38 +
39 +inherit linux-info systemd toolchain-funcs
40 +
41 +DESCRIPTION="Resource-specific view of processes"
42 +HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"
43 +SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
44 +
45 +LICENSE="GPL-2"
46 +SLOT="0"
47 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
48 +IUSE=""
49 +
50 +RDEPEND="
51 + sys-libs/ncurses:0=
52 + >=sys-process/acct-6.6.4-r1
53 +"
54 +DEPEND="
55 + ${RDEPEND}
56 +"
57 +BDEPEND="
58 + virtual/pkgconfig
59 +"
60 +
61 +PATCHES=(
62 + "${FILESDIR}"/${PN}-2.6.0-build.patch
63 +)
64 +
65 +pkg_pretend() {
66 + if use kernel_linux ; then
67 + CONFIG_CHECK="~BSD_PROCESS_ACCT"
68 + check_extra_config
69 + fi
70 +}
71 +
72 +src_prepare() {
73 + default
74 + tc-export CC PKG_CONFIG
75 + sed -i 's: root : :' atop.cronsysv || die #191926
76 + # prefixify
77 + sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
78 +}
79 +
80 +src_install() {
81 + emake DESTDIR="${D}" genericinstall
82 +
83 + # useless -${PV} copies ?
84 + rm "${ED}"/usr/bin/atop*-${PV} || die
85 +
86 + newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
87 + newinitd "${FILESDIR}"/atopacct.rc atopacct
88 +
89 + systemd_dounit "${FILESDIR}"/${PN}.service
90 + systemd_dounit "${FILESDIR}"/atopacct.service
91 +
92 + dodoc atop.cronsysv AUTHOR README
93 +
94 + exeinto /usr/share/${PN}
95 + doexe ${PN}.daily
96 +
97 + insinto /etc/default
98 + newins ${PN}{.default,}
99 +
100 + keepdir /var/log/${PN}
101 +}
102
103 diff --git a/sys-process/atop/files/atop-2.6.0-build.patch b/sys-process/atop/files/atop-2.6.0-build.patch
104 new file mode 100644
105 index 00000000000..b675a16ee36
106 --- /dev/null
107 +++ b/sys-process/atop/files/atop-2.6.0-build.patch
108 @@ -0,0 +1,27 @@
109 +--- a/Makefile
110 ++++ b/Makefile
111 +@@ -33,19 +33,19 @@ VERS = $(shell ./atop -V 2>/dev/null| sed -e 's/^[^ ]* //' -e 's/ .*//')
112 + all: atop atopsar atopacctd atopconvert atopcat
113 +
114 + atop: atop.o $(ALLMODS) Makefile
115 +- $(CC) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS)
116 ++ $(CC) $(CFLAGS) atop.o $(ALLMODS) -o atop $(shell ${PKG_CONFIG} --libs ncurses) -lz -lm -lrt $(LDFLAGS)
117 +
118 + atopsar: atop
119 + ln -sf atop atopsar
120 +
121 + atopacctd: atopacctd.o netlink.o
122 +- $(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
123 ++ $(CC) $(CFLAGS) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
124 +
125 + atopconvert: atopconvert.o
126 +- $(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
127 ++ $(CC) $(CFLAGS) atopconvert.o -o atopconvert -lz $(LDFLAGS)
128 +
129 + atopcat: atopcat.o
130 +- $(CC) atopcat.o -o atopcat $(LDFLAGS)
131 ++ $(CC) $(CFLAGS) atopcat.o -o atopcat $(LDFLAGS)
132 +
133 + clean:
134 + rm -f *.o atop atopacctd atopconvert atopcat
135 +