Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/
Date: Tue, 12 Dec 2017 15:10:53
Message-Id: 1513091443.cd1af859907aa7049c21a589c07ccca7c5ae31ff.polynomial-c@gentoo
1 commit: cd1af859907aa7049c21a589c07ccca7c5ae31ff
2 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
3 AuthorDate: Sun Dec 3 07:52:15 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 12 15:10:43 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd1af859
7
8 sys-process/atop: Remove old
9
10 Package-Manager: Portage-2.3.16, Repoman-2.3.6
11 Closes: https://github.com/gentoo/gentoo/pull/6408
12
13 sys-process/atop/Manifest | 2 --
14 sys-process/atop/atop-1.27_p3.ebuild | 42 -----------------------
15 sys-process/atop/atop-2.2.ebuild | 49 ---------------------------
16 sys-process/atop/atop-2.3.0.ebuild | 64 ------------------------------------
17 sys-process/atop/files/atop.rc | 15 ---------
18 sys-process/atop/files/atop.rc-r1 | 8 -----
19 6 files changed, 180 deletions(-)
20
21 diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
22 index d65838aa545..fb2b2381f0a 100644
23 --- a/sys-process/atop/Manifest
24 +++ b/sys-process/atop/Manifest
25 @@ -1,5 +1,3 @@
26 -DIST atop-1.27-3.tar.gz 159521 BLAKE2B a12291386d13064019f0c6ffab3f7e198d82a3a295444f35756320dec74884ae46ca712828a7a3bfecf763c90c71ea6bfcd82c9bae3fc8371cf5533532bedd16 SHA512 59100b61ff14ff49d8daf815abdbf5e9f905767fe8532b0043f3a63acc4d37975201879a93634f6e77edd307e8b6e7d0bf1a3caff1a3cdce8240e92e46023003
27 -DIST atop-2.2-3.tar.gz 194168 BLAKE2B 7734c486fb83b1d4c00cccef35f01de0ae19442c6c49c65ff251c3abca1cee2af540cb1f8755eb8e039b4786aef6353c2b5b720f5a357d0932a8d632d87e1515 SHA512 34076e35004367bbfd63f3aac1e786dab566633799b5d4f2c4d45f343642d145027f6298aa40d5e83c1356f502e3c51faa58da07cea58f2960bfacd78cf77915
28 DIST atop-2.3.0-netatop_h.patch 3279 BLAKE2B ac663d50c4474d28bbc1c6b70a2f439ccf7f6e0d8c759e6240736fc44bea788fc76eea18769422bf391079945515a12615bae3139ca758d03b4687653a1d5cd1 SHA512 9b84adf3e740eca5e42199bb3e9e65e08ffb07f60e7c02d04b73cfe4b63a4f563991a797def5826ba10a32c78d2363ebe9b4e41d12cf9e7118e3eb82d259c31b
29 DIST atop-2.3.0-version_c.patch 1537 BLAKE2B eda9f0aa427e39ef12aa1584e6277de00577dff81a85085b8b12478a7631cb1739196a91feb684c2b9bdc0bd879493d1bb3a5dca8062da650cda78ae7744e934 SHA512 48589cb29cc969c25d0dbc5c5237200b28af6f1b5daf478abdd52079360938887f9de0fa4a379479c5bf8f3ba31946eba5aae19fe3246f36e82a132708840373
30 DIST atop-2.3.0-version_h.patch 748 BLAKE2B 95aa0e819d35498436ddb2554f457e9bf74a70395f077d8f0625b52469d3f4a1f5793afc061aa1f7105fbea6223bb19bbcb999be4231b761523eb28cb5243542 SHA512 79ea49421e9bd82322cae26148d608560910a3d2e089228d2218d93744dcba8398058dd75255b64d15301c8bc4bde1dd6e15b6c6949a01534557b24b3d79089d
31
32 diff --git a/sys-process/atop/atop-1.27_p3.ebuild b/sys-process/atop/atop-1.27_p3.ebuild
33 deleted file mode 100644
34 index 7e615c59c18..00000000000
35 --- a/sys-process/atop/atop-1.27_p3.ebuild
36 +++ /dev/null
37 @@ -1,42 +0,0 @@
38 -# Copyright 1999-2017 Gentoo Foundation
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI="3"
42 -
43 -inherit eutils toolchain-funcs
44 -
45 -MY_PV=${PV//_p/-}
46 -MY_P=${PN}-${MY_PV}
47 -
48 -DESCRIPTION="Resource-specific view of processes"
49 -HOMEPAGE="https://www.atoptool.nl/"
50 -SRC_URI="https://www.atoptool.nl/download/${MY_P}.tar.gz"
51 -
52 -LICENSE="GPL-2"
53 -SLOT="0"
54 -KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ~ppc64 x86"
55 -IUSE=""
56 -
57 -DEPEND="sys-process/acct"
58 -
59 -S=${WORKDIR}/${MY_P}
60 -
61 -src_prepare() {
62 - sed -i \
63 - -e '/^CFLAGS/s: = -O : += :' \
64 - -e '/^LDFLAGS/s: = : += :' \
65 - -e 's:\<cc\>:$(CC):' \
66 - Makefile
67 - tc-export CC
68 - cp "${FILESDIR}"/atop.rc atop.init
69 - chmod a+rx atop.init
70 - sed -i 's: root : :' atop.cron #191926
71 -}
72 -
73 -src_install() {
74 - emake DESTDIR="${D}" INIPATH=/etc/init.d install || die
75 - # useless -${PV} copies ?
76 - rm -f "${D}"/usr/bin/atop*-${PV}
77 - dodoc README "${D}"/etc/cron.d/*
78 - rm -r "${D}"/etc/cron.d || die
79 -}
80
81 diff --git a/sys-process/atop/atop-2.2.ebuild b/sys-process/atop/atop-2.2.ebuild
82 deleted file mode 100644
83 index 2c3035fb4f8..00000000000
84 --- a/sys-process/atop/atop-2.2.ebuild
85 +++ /dev/null
86 @@ -1,49 +0,0 @@
87 -# Copyright 1999-2017 Gentoo Foundation
88 -# Distributed under the terms of the GNU General Public License v2
89 -
90 -EAPI="4"
91 -
92 -inherit eutils toolchain-funcs systemd
93 -
94 -MY_PV=${PV//_p/-}
95 -MY_P=${PN}-${MY_PV}-3
96 -
97 -DESCRIPTION="Resource-specific view of processes"
98 -HOMEPAGE="https://www.atoptool.nl/"
99 -SRC_URI="https://www.atoptool.nl/download/${MY_P}.tar.gz"
100 -
101 -LICENSE="GPL-2"
102 -SLOT="0"
103 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
104 -IUSE=""
105 -
106 -RDEPEND="
107 - sys-libs/ncurses
108 - sys-process/acct
109 -"
110 -DEPEND="
111 - ${RDEPEND}
112 - virtual/pkgconfig
113 -"
114 -
115 -S=${WORKDIR}/${MY_P}
116 -
117 -src_prepare() {
118 - epatch "${FILESDIR}"/${PN}-2.2-build.patch
119 - epatch "${FILESDIR}"/${PN}-2.2-sysmacros.patch #580372
120 - tc-export CC PKG_CONFIG
121 - sed -i 's: root : :' atop.cronsysv || die #191926
122 - # prefixify
123 - sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile
124 -}
125 -
126 -src_install() {
127 - emake DESTDIR="${D}" genericinstall
128 - # useless -${PV} copies ?
129 - rm -f "${ED}"/usr/bin/atop*-${MY_PV}
130 - newinitd "${FILESDIR}"/${PN}.rc-r1 ${PN}
131 - newinitd "${FILESDIR}"/atopacct.rc atopacct
132 - systemd_dounit "${FILESDIR}"/${PN}.service
133 - systemd_dounit "${FILESDIR}"/atopacct.service
134 - dodoc atop.cronsysv AUTHOR ChangeLog README
135 -}
136
137 diff --git a/sys-process/atop/atop-2.3.0.ebuild b/sys-process/atop/atop-2.3.0.ebuild
138 deleted file mode 100644
139 index 31cb7439dd3..00000000000
140 --- a/sys-process/atop/atop-2.3.0.ebuild
141 +++ /dev/null
142 @@ -1,64 +0,0 @@
143 -# Copyright 1999-2017 Gentoo Foundation
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -EAPI=6
147 -
148 -inherit linux-info systemd toolchain-funcs
149 -
150 -DESCRIPTION="Resource-specific view of processes"
151 -HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"
152 -SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
153 -
154 -# Tarballs lacks version.{c,h} files
155 -SRC_URI+=" https://github.com/Atoptool/atop/commit/42e86fcc42ce60f8c92f3c7d5f3a6ccde47c0b33.patch -> ${PN}-2.3.0-version_h.patch"
156 -SRC_URI+=" https://github.com/Atoptool/atop/commit/a8d850d06efc8d70a19f55ec93fe83df51e99077.patch -> ${PN}-2.3.0-version_c.patch"
157 -SRC_URI+=" https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd672631b6033c36c1.patch -> ${PN}-2.3.0-netatop_h.patch"
158 -
159 -LICENSE="GPL-2"
160 -SLOT="0"
161 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
162 -IUSE=""
163 -
164 -RDEPEND="
165 - sys-libs/ncurses:0=
166 - sys-process/acct
167 -"
168 -DEPEND="
169 - ${RDEPEND}
170 - virtual/pkgconfig
171 -"
172 -
173 -PATCHES=(
174 - "${FILESDIR}"/${PN}-2.2-build.patch
175 - "${FILESDIR}"/${PN}-2.2-sysmacros.patch #580372
176 -
177 - # taken from upstream.
178 - "${DISTDIR}"/${P}-version_{h,c}.patch
179 - "${DISTDIR}"/${P}-netatop_h.patch
180 -)
181 -
182 -pkg_pretend() {
183 - if use kernel_linux ; then
184 - CONFIG_CHECK="~BSD_PROCESS_ACCT"
185 - check_extra_config
186 - fi
187 -}
188 -
189 -src_prepare() {
190 - default
191 - tc-export CC PKG_CONFIG
192 - sed -i 's: root : :' atop.cronsysv || die #191926
193 - # prefixify
194 - sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile
195 -}
196 -
197 -src_install() {
198 - emake DESTDIR="${D}" genericinstall
199 - # useless -${PV} copies ?
200 - rm -f "${ED%/}"/usr/bin/atop*-${PV}
201 - newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
202 - newinitd "${FILESDIR}"/atopacct.rc atopacct
203 - systemd_dounit "${FILESDIR}"/${PN}.service
204 - systemd_dounit "${FILESDIR}"/atopacct.service
205 - dodoc atop.cronsysv AUTHOR README
206 -}
207
208 diff --git a/sys-process/atop/files/atop.rc b/sys-process/atop/files/atop.rc
209 deleted file mode 100644
210 index f05db6a0e15..00000000000
211 --- a/sys-process/atop/files/atop.rc
212 +++ /dev/null
213 @@ -1,15 +0,0 @@
214 -#!/sbin/openrc-run
215 -# Copyright 1999-2010 Gentoo Foundation
216 -# Distributed under the terms of the GNU General Public License v2
217 -
218 -start() {
219 - ebegin "Starting atop"
220 - start-stop-daemon --start --quiet --exec /etc/atop/atop.daily
221 - eend $?
222 -}
223 -
224 -stop() {
225 - ebegin "Stopping atop"
226 - start-stop-daemon --stop --exec /usr/bin/atop --pidfile /var/run/atop.pid
227 - eend $?
228 -}
229
230 diff --git a/sys-process/atop/files/atop.rc-r1 b/sys-process/atop/files/atop.rc-r1
231 deleted file mode 100644
232 index c5172283a21..00000000000
233 --- a/sys-process/atop/files/atop.rc-r1
234 +++ /dev/null
235 @@ -1,8 +0,0 @@
236 -#!/sbin/openrc-run
237 -# Copyright 1999-2017 Gentoo Foundation
238 -# Distributed under the terms of the GNU General Public License v2
239 -
240 -description="Resource-specific view of processes"
241 -pidfile="/var/run/atop.pid"
242 -command="/etc/atop/atop.daily"
243 -command_background="true"