Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/
Date: Sun, 20 Feb 2022 05:27:37
Message-Id: 1645334789.a6f5ed8bc85a0ccfb977ec8b10162c066bd4d5a6.sam@gentoo
1 commit: a6f5ed8bc85a0ccfb977ec8b10162c066bd4d5a6
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 20 05:15:13 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 20 05:26:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f5ed8b
7
8 sys-process/atop: drop 2.7.0-r1, 2.7.1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-process/atop/Manifest | 1 -
13 sys-process/atop/atop-2.7.0-r1.ebuild | 111 ---------------------------------
14 sys-process/atop/atop-2.7.1.ebuild | 113 ----------------------------------
15 3 files changed, 225 deletions(-)
16
17 diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
18 index 5dbf3429dc37..0629516a4ea7 100644
19 --- a/sys-process/atop/Manifest
20 +++ b/sys-process/atop/Manifest
21 @@ -1,4 +1,3 @@
22 DIST atop-2.6.0.tar.gz 242323 BLAKE2B 8cf39c4b18994de26188ad5e19e282bc3ef7693eeff4853386f6b254d1115dbd2308eaa4c6e7620e6081d44037e6ce01356ad72ba25bcf4b1c3e7674768e5c24 SHA512 46cbc1c67ee6683be8dca79bf68d85962a119469ddce4947519cf4fe178b14d54b69451cfaa2b5c0a3f8c9bf8769de619aa5a7768eae34422688c7fc26fe0a58
23 -DIST atop-2.7.0.tar.gz 248294 BLAKE2B 94587d1ea07fcbbc8b267b96d0e7aa89b04cef9b39ccae0057bfb6163b15b8fdf3ddc9edb377bf40f48f60b4dd29feaf64201b1fd8c396dfb34c610772bc629c SHA512 2b3a1fbbd01728228df9ab1b6a99458fa0f962cc945b198a79298152ff115f6131fdb86fc806fc647a28d86e6e1a56375ca9d4dc530e082a122cf6ffba3dac7b
24 DIST atop-2.7.1.tar.gz 248809 BLAKE2B 2cf1a68a7b24d76340295d9bde03a5602e9049a860468217771c696fe4b9062f2155aeefa2e3e810984780f82de6bf922bf7d6b02c7fd19194162dc70b015b81 SHA512 18f30c67d6f86b9270599317eed846c63d19e8ba6ea85bad8ec3d5ffb0489f17c75c8d8b3a14054bd14e89ed40d39e5d37bce834c7422087e6d8b86c99273a72
25 DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61feeeee6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68
26
27 diff --git a/sys-process/atop/atop-2.7.0-r1.ebuild b/sys-process/atop/atop-2.7.0-r1.ebuild
28 deleted file mode 100644
29 index 4e4a270b83e0..000000000000
30 --- a/sys-process/atop/atop-2.7.0-r1.ebuild
31 +++ /dev/null
32 @@ -1,111 +0,0 @@
33 -# Copyright 1999-2022 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -# Check on bumps of atop
39 -# https://www.atoptool.nl/downloadnetatop.php
40 -NETATOP_VER=3.1
41 -
42 -# Controls 'netatop' kernel module
43 -MODULES_OPTIONAL_USE="modules"
44 -NETATOP_P=net${PN}-${NETATOP_VER}
45 -NETATOP_S="${WORKDIR}"/${NETATOP_P}
46 -
47 -inherit linux-info linux-mod systemd toolchain-funcs
48 -
49 -DESCRIPTION="Resource-specific view of processes"
50 -HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"
51 -SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
52 -SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
53 -
54 -# Module is GPL-2 as well
55 -LICENSE="GPL-2"
56 -SLOT="0"
57 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
58 -
59 -RDEPEND="sys-libs/ncurses:0=
60 - >=sys-process/acct-6.6.4-r1
61 - modules? ( sys-libs/zlib )"
62 -DEPEND="${RDEPEND}"
63 -BDEPEND="virtual/pkgconfig"
64 -
65 -PATCHES=(
66 - "${FILESDIR}"/${PN}-2.6.0-build.patch
67 -)
68 -
69 -pkg_pretend() {
70 - if use kernel_linux ; then
71 - CONFIG_CHECK="~BSD_PROCESS_ACCT"
72 - check_extra_config
73 - fi
74 -}
75 -
76 -src_prepare() {
77 - default
78 -
79 - if use modules ; then
80 - cd "${WORKDIR}"/${NETATOP_P} || die
81 - eapply -p1 "${FILESDIR}"/${PN}-2.7.0-netatop-makefile.patch
82 - cd "${S}" || die
83 - fi
84 -
85 - tc-export CC PKG_CONFIG
86 -
87 - # bug #191926
88 - sed -i 's: root : :' atop.cronsysv || die
89 -
90 - # prefixify
91 - sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
92 -}
93 -
94 -src_configure() {
95 - default
96 -
97 - BUILD_TARGETS="netatop.ko"
98 - MODULE_NAMES="netatop(:${NETATOP_S}/module)"
99 -}
100 -
101 -src_compile() {
102 - default
103 -
104 - linux-mod_src_compile
105 -}
106 -
107 -src_install() {
108 - linux-mod_src_install
109 -
110 - if use modules ; then
111 - # netatop's Makefile tries to build the kernel module for us
112 - # so let's just replicate parts of it here.
113 - emake -C "${NETATOP_S}"/daemon all
114 -
115 - dosbin "${NETATOP_S}"/daemon/netatopd
116 - doman "${NETATOP_S}"/man/*
117 -
118 - systemd_dounit "${NETATOP_S}"/netatop.service
119 -
120 - newinitd "${FILESDIR}"/netatop.rc netatop
121 - fi
122 -
123 - emake DESTDIR="${D}" genericinstall
124 -
125 - # useless -${PV} copies ?
126 - rm "${ED}"/usr/bin/atop*-${PV} || die
127 -
128 - newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
129 - newinitd "${FILESDIR}"/atopacct.rc atopacct
130 -
131 - systemd_dounit "${FILESDIR}"/${PN}.service-r1
132 - systemd_dounit "${FILESDIR}"/atopacct.service
133 -
134 - dodoc atop.cronsysv AUTHOR README
135 -
136 - exeinto /usr/share/${PN}
137 - doexe ${PN}.daily
138 -
139 - insinto /etc/default
140 - newins ${PN}{.default,}
141 -
142 - keepdir /var/log/${PN}
143 -}
144
145 diff --git a/sys-process/atop/atop-2.7.1.ebuild b/sys-process/atop/atop-2.7.1.ebuild
146 deleted file mode 100644
147 index 1adcbe0d802e..000000000000
148 --- a/sys-process/atop/atop-2.7.1.ebuild
149 +++ /dev/null
150 @@ -1,113 +0,0 @@
151 -# Copyright 1999-2022 Gentoo Authors
152 -# Distributed under the terms of the GNU General Public License v2
153 -
154 -EAPI=7
155 -
156 -# Check on bumps of atop
157 -# https://www.atoptool.nl/downloadnetatop.php
158 -NETATOP_VER=3.1
159 -
160 -# Controls 'netatop' kernel module
161 -MODULES_OPTIONAL_USE="modules"
162 -NETATOP_P=net${PN}-${NETATOP_VER}
163 -NETATOP_S="${WORKDIR}"/${NETATOP_P}
164 -
165 -inherit linux-info linux-mod systemd toolchain-funcs
166 -
167 -DESCRIPTION="Resource-specific view of processes"
168 -HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"
169 -SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
170 -SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
171 -
172 -# Module is GPL-2 as well
173 -LICENSE="GPL-2"
174 -SLOT="0"
175 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
176 -
177 -RDEPEND="sys-libs/ncurses:0=
178 - >=sys-process/acct-6.6.4-r1
179 - modules? ( sys-libs/zlib )"
180 -DEPEND="${RDEPEND}"
181 -BDEPEND="virtual/pkgconfig"
182 -
183 -PATCHES=(
184 - "${FILESDIR}"/${PN}-2.6.0-build.patch
185 -)
186 -
187 -pkg_pretend() {
188 - if use kernel_linux ; then
189 - CONFIG_CHECK="~BSD_PROCESS_ACCT"
190 - check_extra_config
191 - fi
192 -}
193 -
194 -src_prepare() {
195 - default
196 -
197 - if use modules ; then
198 - cd "${WORKDIR}"/${NETATOP_P} || die
199 - eapply -p1 "${FILESDIR}"/${PN}-2.7.0-netatop-makefile.patch
200 - cd "${S}" || die
201 - fi
202 -
203 - tc-export CC PKG_CONFIG
204 -
205 - # bug #191926
206 - sed -i 's: root : :' atop.cronsysv || die
207 -
208 - # prefixify
209 - sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
210 -}
211 -
212 -src_configure() {
213 - default
214 -
215 - BUILD_TARGETS="netatop.ko"
216 - MODULE_NAMES="netatop(:${NETATOP_S}/module)"
217 -}
218 -
219 -src_compile() {
220 - default
221 -
222 - linux-mod_src_compile
223 -}
224 -
225 -src_install() {
226 - linux-mod_src_install
227 -
228 - if use modules ; then
229 - # netatop's Makefile tries to build the kernel module for us
230 - # so let's just replicate parts of it here.
231 - emake -C "${NETATOP_S}"/daemon all
232 -
233 - dosbin "${NETATOP_S}"/daemon/netatopd
234 - doman "${NETATOP_S}"/man/*
235 -
236 - systemd_dounit "${NETATOP_S}"/netatop.service
237 -
238 - newinitd "${FILESDIR}"/netatop.rc netatop
239 - fi
240 -
241 - emake DESTDIR="${D}" genericinstall
242 -
243 - # useless -${PV} copies ?
244 - rm "${ED}"/usr/bin/atop*-${PV} || die
245 -
246 - # Note: in the next release (> 2.7.1), switch to upstream files
247 - # (ours are now upstreamed)
248 - newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
249 - newinitd "${FILESDIR}"/atopacct.rc atopacct
250 -
251 - systemd_dounit "${FILESDIR}"/${PN}.service-r1
252 - systemd_dounit "${FILESDIR}"/atopacct.service
253 -
254 - dodoc atop.cronsysv AUTHOR README
255 -
256 - exeinto /usr/share/${PN}
257 - doexe ${PN}.daily
258 -
259 - insinto /etc/default
260 - newins ${PN}{.default,}
261 -
262 - keepdir /var/log/${PN}
263 -}