gentoo resync : 22.01.2019

3 files changed, 81 insertions, 0 deletions

diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index eb3226db5b0f..bcd20cd89105 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -1,5 +1,6 @@
 AUX atop-2.2-build.patch 898 BLAKE2B 41be74ee6676a0cfeda2b42274618568e156b6bb56b5ff5809ab3f38a96e07b18a67b51921509fe46966c43ceb535ead806f58e0f3b3bf5f7a70fa1996ab0c74 SHA512 f291cf34d975367f0e972b7fb62f8c91234d0d8da2c903f82e18f160f435e8e8a57ad7eeb5ef9c438e6a5f86c0e9c237d518a4fe09dcf43dcfa5ff39ab769ffc
 AUX atop-2.2-sysmacros.patch 283 BLAKE2B 175d69f6c8d0fe6ce909ab95375cd5f23aef2bb9cf86a80c94e6002e5268cbea2d37f64a159f0d1db9d2ff8288115712f9544129f4a4eedb9b94569e5155f54e SHA512 8dd708193a57abad2e53625278ab60cfc74bca7ae2851d54584542257dd16161f8262eb7f3f26a9c2e274f8c481012850a5a30c193353b506e4d1e7a43e1565a
+AUX atop-2.4.0-build.patch 704 BLAKE2B 76b19a4a7926d9d9e737e529cba0aa03ab4331f91b2a30ef6ebbc5a7f03004e9c9e953eb7f3119c30bd9bf150fde146b17148fdba088e67ce5d5739ddf9d00e9 SHA512 77e125d8bc0a7e798b0d1f00cbdbe03c29842336aa178231a1b667759ebbbfe39ec14627c2a9185c2fc33a5f4b0a2d03c6309e5f60098ce0eeb6438c60b29211
 AUX atop.rc-r2 268 BLAKE2B d0673e73ee13d7ac5f1c31544f8f9ba8aefe14c2ebf4e90b090d5a64a308bdd2e42b4131ea5c931e9e2f2386139343cfceb7c04c1378ebd3a260a5d55d0dd5b6 SHA512 07699f1190faa3a8343314b5c8419e7ea49280fef664334f03558907eb5654bc33c7f4baa3fa54cc6f07866c378c984ff81e020e69f0b146c68b8503ab010d0c
 AUX atop.service 190 BLAKE2B 905a7b42d38b3ab25916c90d7b50c52721f9b061c99e8ce5b9d8cc6c452d1dfeba5478389471778e2a988fd058301bae001139c1396bd9c4a76f2b7f79968377 SHA512 194e9703f34b6a1c749ed5bae3e8708dc625d30e174e285a0998c8aa0d2b1b34da70a3d1db86380abc40615b28a5bdb37b2d511be983da5fd7f154b9686ba343
 AUX atopacct.rc 1054 BLAKE2B 80f301506d805ae54552f088c53bf18cab1ee52b76a37387500176e61eba317059b10c9955d13ac5718547253401ec21f0add4b189e5d04ff724af43c8c50b73 SHA512 ddb026c4ebf63dccc6f49b2b7db829d7ba0388da080a65562bac3f2d7ebacc95093099a0fc9d636af5462ace4a9e118eacfe3eb626a70245e7c5c1e874866f02
@@ -8,5 +9,7 @@ DIST atop-2.3.0-netatop_h.patch 3279 BLAKE2B ac663d50c4474d28bbc1c6b70a2f439ccf7
 DIST atop-2.3.0-version_c.patch 1537 BLAKE2B eda9f0aa427e39ef12aa1584e6277de00577dff81a85085b8b12478a7631cb1739196a91feb684c2b9bdc0bd879493d1bb3a5dca8062da650cda78ae7744e934 SHA512 48589cb29cc969c25d0dbc5c5237200b28af6f1b5daf478abdd52079360938887f9de0fa4a379479c5bf8f3ba31946eba5aae19fe3246f36e82a132708840373
 DIST atop-2.3.0-version_h.patch 748 BLAKE2B 95aa0e819d35498436ddb2554f457e9bf74a70395f077d8f0625b52469d3f4a1f5793afc061aa1f7105fbea6223bb19bbcb999be4231b761523eb28cb5243542 SHA512 79ea49421e9bd82322cae26148d608560910a3d2e089228d2218d93744dcba8398058dd75255b64d15301c8bc4bde1dd6e15b6c6949a01534557b24b3d79089d
 DIST atop-2.3.0.tar.gz 190560 BLAKE2B 4c7a8f33f7e32fb6107275c21db54af91ffdb06cea14039ba85c6e844efc05e5c64708dae48eb3a7b8e075378838937ddd4756a954e6a040d4b3e8c4e7dd9e93 SHA512 8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621
+DIST atop-2.4.0.tar.gz 230066 BLAKE2B 75070f0a87f9745f0e018ef5aac7e71060acea77e2043d43594a492875126945ef4c5bfe15f69b300ce6ac25c38f54360ba761ad7fc510016a91b71dc3377957 SHA512 8872626db447b2b7265fa257bc78795c3a5bc2f0dfffae94d01df4090de75feeb092e5a33421877aa12563dde3df18734b5db947c828cec6949284fbeb9dbc8d
 EBUILD atop-2.3.0-r1.ebuild 1835 BLAKE2B 8508bba0c31f2fc5f73a708b464d45e0603178a23966cd8e9bd0fc1968f02f036664d5ec2f3f917a51b2ed303bd845bc370258ac9e6fb569e97a57306c78eb7e SHA512 a83ace4dcab3d628151cd5f976f4d10baf4c23ff48b0b814e75f1cab90a9553575bb71b4744d5ed4cecc6fac0a3708d0c316fc66d94bf65cf7818ae0393e8838
+EBUILD atop-2.4.0.ebuild 1287 BLAKE2B 88b75183ccc9516e64fd0ec7eb68a822384fc3ab8d5d78e06c38a5cc1c4447785533d862aac711e830853d3c0e2a480d1899db9d16e2175c8d0c3c2ec1a0e6a4 SHA512 b90c22b77398e513b3ce0c17e599264615142254a11240039dc83592a3e066f1fd176ec608e204d6b466c26b6f79970d5a78379618442033afdbd300f940e278
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/atop/atop-2.4.0.ebuild b/sys-process/atop/atop-2.4.0.ebuild
new file mode 100644
index 000000000000..8af7b18c2d7d
--- /dev/null
+++ b/sys-process/atop/atop-2.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.0-build.patch
+
+	# taken from upstream.
+)
+
+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
+}
diff --git a/sys-process/atop/files/atop-2.4.0-build.patch b/sys-process/atop/files/atop-2.4.0-build.patch
new file mode 100644
index 000000000000..73fd41691299
--- /dev/null
+++ b/sys-process/atop/files/atop-2.4.0-build.patch
@@ -0,0 +1,22 @@
+--- atop-2.4.0/Makefile
++++ atop-2.4.0/Makefile
+@@ -33,16 +33,16 @@
+ 
+ atop:		atop.o    $(ALLMODS) Makefile
+ 		$(CC) -c version.c
+-		$(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt $(LDFLAGS)
++		$(CC) $(CFLAGS) $(LDFLAGS) atop.o $(ALLMODS) -o atop $(shell ${PKG_CONFIG} --libs ncurses) -lz -lm -lrt
+ 
+ atopsar:	atop
+ 		ln -sf atop atopsar
+ 
+ atopacctd:	atopacctd.o netlink.o
+-		$(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
++		$(CC) $(CFLAGS) $(LDFLAGS) atopacctd.o netlink.o -o atopacctd
+ 
+ atopconvert:	atopconvert.o
+-		$(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
++		$(CC) $(CFLAGS) $(LDFLAGS) atopconvert.o -o atopconvert -lz
+ 
+ netlink.o:	netlink.c
+ 		$(CC) -I. -Wall -c netlink.c