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: Mon, 14 Jan 2019 12:13:35
Message-Id: 1547467992.f248a174a3305abf4ef827c115d969ae3c342d77.polynomial-c@gentoo
1 commit: f248a174a3305abf4ef827c115d969ae3c342d77
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 14 12:13:12 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 14 12:13:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f248a174
7
8 sys-process/atop: Bump to version 2.4.0
9
10 Package-Manager: Portage-2.3.55, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-process/atop/Manifest | 1 +
14 sys-process/atop/atop-2.4.0.ebuild | 56 +++++++++++++++++++++++++++
15 sys-process/atop/files/atop-2.4.0-build.patch | 22 +++++++++++
16 3 files changed, 79 insertions(+)
17
18 diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
19 index fb2b2381f0a..d65dc64336b 100644
20 --- a/sys-process/atop/Manifest
21 +++ b/sys-process/atop/Manifest
22 @@ -2,3 +2,4 @@ DIST atop-2.3.0-netatop_h.patch 3279 BLAKE2B ac663d50c4474d28bbc1c6b70a2f439ccf7
23 DIST atop-2.3.0-version_c.patch 1537 BLAKE2B eda9f0aa427e39ef12aa1584e6277de00577dff81a85085b8b12478a7631cb1739196a91feb684c2b9bdc0bd879493d1bb3a5dca8062da650cda78ae7744e934 SHA512 48589cb29cc969c25d0dbc5c5237200b28af6f1b5daf478abdd52079360938887f9de0fa4a379479c5bf8f3ba31946eba5aae19fe3246f36e82a132708840373
24 DIST atop-2.3.0-version_h.patch 748 BLAKE2B 95aa0e819d35498436ddb2554f457e9bf74a70395f077d8f0625b52469d3f4a1f5793afc061aa1f7105fbea6223bb19bbcb999be4231b761523eb28cb5243542 SHA512 79ea49421e9bd82322cae26148d608560910a3d2e089228d2218d93744dcba8398058dd75255b64d15301c8bc4bde1dd6e15b6c6949a01534557b24b3d79089d
25 DIST atop-2.3.0.tar.gz 190560 BLAKE2B 4c7a8f33f7e32fb6107275c21db54af91ffdb06cea14039ba85c6e844efc05e5c64708dae48eb3a7b8e075378838937ddd4756a954e6a040d4b3e8c4e7dd9e93 SHA512 8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621
26 +DIST atop-2.4.0.tar.gz 230066 BLAKE2B 75070f0a87f9745f0e018ef5aac7e71060acea77e2043d43594a492875126945ef4c5bfe15f69b300ce6ac25c38f54360ba761ad7fc510016a91b71dc3377957 SHA512 8872626db447b2b7265fa257bc78795c3a5bc2f0dfffae94d01df4090de75feeb092e5a33421877aa12563dde3df18734b5db947c828cec6949284fbeb9dbc8d
27
28 diff --git a/sys-process/atop/atop-2.4.0.ebuild b/sys-process/atop/atop-2.4.0.ebuild
29 new file mode 100644
30 index 00000000000..8af7b18c2d7
31 --- /dev/null
32 +++ b/sys-process/atop/atop-2.4.0.ebuild
33 @@ -0,0 +1,56 @@
34 +# Copyright 1999-2019 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=6
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 + virtual/pkgconfig
57 +"
58 +
59 +PATCHES=(
60 + "${FILESDIR}"/${PN}-2.4.0-build.patch
61 +
62 + # taken from upstream.
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 + # useless -${PV} copies ?
83 + rm "${ED%/}"/usr/bin/atop*-${PV} || die
84 + newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
85 + newinitd "${FILESDIR}"/atopacct.rc atopacct
86 + systemd_dounit "${FILESDIR}"/${PN}.service
87 + systemd_dounit "${FILESDIR}"/atopacct.service
88 + dodoc atop.cronsysv AUTHOR README
89 +}
90
91 diff --git a/sys-process/atop/files/atop-2.4.0-build.patch b/sys-process/atop/files/atop-2.4.0-build.patch
92 new file mode 100644
93 index 00000000000..73fd4169129
94 --- /dev/null
95 +++ b/sys-process/atop/files/atop-2.4.0-build.patch
96 @@ -0,0 +1,22 @@
97 +--- atop-2.4.0/Makefile
98 ++++ atop-2.4.0/Makefile
99 +@@ -33,16 +33,16 @@
100 +
101 + atop: atop.o $(ALLMODS) Makefile
102 + $(CC) -c version.c
103 +- $(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt $(LDFLAGS)
104 ++ $(CC) $(CFLAGS) $(LDFLAGS) atop.o $(ALLMODS) -o atop $(shell ${PKG_CONFIG} --libs ncurses) -lz -lm -lrt
105 +
106 + atopsar: atop
107 + ln -sf atop atopsar
108 +
109 + atopacctd: atopacctd.o netlink.o
110 +- $(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
111 ++ $(CC) $(CFLAGS) $(LDFLAGS) atopacctd.o netlink.o -o atopacctd
112 +
113 + atopconvert: atopconvert.o
114 +- $(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
115 ++ $(CC) $(CFLAGS) $(LDFLAGS) atopconvert.o -o atopconvert -lz
116 +
117 + netlink.o: netlink.c
118 + $(CC) -I. -Wall -c netlink.c