gentoo resync : 15.12.2017

7 files changed, 3 insertions, 188 deletions

diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index 669b63ed3e52..ec7949ca8943 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -1,19 +1,12 @@
 AUX atop-2.2-build.patch 898 BLAKE2B 41be74ee6676a0cfeda2b42274618568e156b6bb56b5ff5809ab3f38a96e07b18a67b51921509fe46966c43ceb535ead806f58e0f3b3bf5f7a70fa1996ab0c74 SHA512 f291cf34d975367f0e972b7fb62f8c91234d0d8da2c903f82e18f160f435e8e8a57ad7eeb5ef9c438e6a5f86c0e9c237d518a4fe09dcf43dcfa5ff39ab769ffc
 AUX atop-2.2-sysmacros.patch 283 BLAKE2B 175d69f6c8d0fe6ce909ab95375cd5f23aef2bb9cf86a80c94e6002e5268cbea2d37f64a159f0d1db9d2ff8288115712f9544129f4a4eedb9b94569e5155f54e SHA512 8dd708193a57abad2e53625278ab60cfc74bca7ae2851d54584542257dd16161f8262eb7f3f26a9c2e274f8c481012850a5a30c193353b506e4d1e7a43e1565a
-AUX atop.rc 355 BLAKE2B b6413db49c02d0eff09a013f817ab45a89fa31e8b7ad055556a627b70fc4f788f4238b54b47f82296efd2330d62d90cb115772aaf159baa17dbe3a39464f9586 SHA512 95a8c92fd78a78653f8b9a7ca4a2cbe3135836e4cd1e7c81ad33a106c8e51911250078bd4fa1d903f2632eb7cba6053333d934546bba26fbf6853071775452d2
-AUX atop.rc-r1 262 BLAKE2B a0db774f3e7f3deafed7cebde1e25053cf8eee0e9c772bfaaabb243164be11f2830107fac64d22d070d1e2fcc3b887f3574f47340113424afe20921a5204fe99 SHA512 d1bed61a77917311103a6ab7130c5179e0ca2178579f07fa0fa5caabbdabe0e82b75f4dbc197d50ae6710fca5d38f0a585109600430a217d755da6ad9ee7955b
 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
 AUX atopacct.service 269 BLAKE2B 8cf88201ecb08da441cd066c0d6974afbae41018a5b2ef9c6b1b805d5be53f2bc5849dafe1d0e2d996e3598ed1baa93e3a0e559fe33c11c55bf64345af5c2bab SHA512 1e57eb76db3e78be504a1a11a479d154239f269da5f5cd3a52eced4ca63ea051d003f14d498d9a71070b7081b2ff80f5eeb5453b81952ee0e4c05423e3c2d308
-DIST atop-1.27-3.tar.gz 159521 BLAKE2B a12291386d13064019f0c6ffab3f7e198d82a3a295444f35756320dec74884ae46ca712828a7a3bfecf763c90c71ea6bfcd82c9bae3fc8371cf5533532bedd16 SHA512 59100b61ff14ff49d8daf815abdbf5e9f905767fe8532b0043f3a63acc4d37975201879a93634f6e77edd307e8b6e7d0bf1a3caff1a3cdce8240e92e46023003
-DIST atop-2.2-3.tar.gz 194168 BLAKE2B 7734c486fb83b1d4c00cccef35f01de0ae19442c6c49c65ff251c3abca1cee2af540cb1f8755eb8e039b4786aef6353c2b5b720f5a357d0932a8d632d87e1515 SHA512 34076e35004367bbfd63f3aac1e786dab566633799b5d4f2c4d45f343642d145027f6298aa40d5e83c1356f502e3c51faa58da07cea58f2960bfacd78cf77915
 DIST atop-2.3.0-netatop_h.patch 3279 BLAKE2B ac663d50c4474d28bbc1c6b70a2f439ccf7f6e0d8c759e6240736fc44bea788fc76eea18769422bf391079945515a12615bae3139ca758d03b4687653a1d5cd1 SHA512 9b84adf3e740eca5e42199bb3e9e65e08ffb07f60e7c02d04b73cfe4b63a4f563991a797def5826ba10a32c78d2363ebe9b4e41d12cf9e7118e3eb82d259c31b
 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
-EBUILD atop-1.27_p3.ebuild 915 BLAKE2B 3ab2e37912cf79a2e1b968b24de9ed7bf4752bca34aeec3ef48e9e00ded80f7f34e26090355c7b32ffe2f54b01d8a7549dd088aa2a1afae7d68fd9ba33ee7a5b SHA512 907656fe15cd36e60fd5f7a649337839d560ff01e5c448256b7f2121de896d21dbfb53a3e07cc4913da41eff002ec99a5b100fce3856ac55feb670b4e91ef035
-EBUILD atop-2.2.ebuild 1181 BLAKE2B c47e973000b48ba25e985aa91dc45f2cab21770af12df0aa80d697a874dd581ce652fdc45d1a7c7b447389cb3169f2c255477cf8c39ae49a2a9b67b7bfae4e18 SHA512 1c48f49e6b76f97f13e44f776ba7ed6a5a4bc7de43d0df3b2d30ce0cb578c6671baf3741f6e5e7d24b42006601dbe7b5a79739a2e0819ff955baf9a12db8015e
-EBUILD atop-2.3.0-r1.ebuild 1817 BLAKE2B fe696c2365ab033df4c38733ff99e82c359b2815f573e4ce353c35be6c4f1eecfa058383003ed06d5de2061339279670b598b1a9d0da89591400f0225c3d3a7f SHA512 b8d99ef1b45e20a1b7f03eb0eaf3370879ef95354a1e90f5c24d04900aa4c481c0270c892c01300f98a81ed6f664bb8ffcc1ba848e2508cc53dc140a7bf95f52
-EBUILD atop-2.3.0.ebuild 1810 BLAKE2B 1f621753e8b67ef854ada64563a6f0538f4018433d0185dee7283122c29bf0be7b4b9c2bcb0668fa4fe1bb4082da2f0460ed2a4d935590f31f248fdab0439a9d SHA512 9eb4c1bc4b78fb3f245589f2409e813ee267f51936ea2f1fbcf64e04c7b5e730147a41d2da767f05590814942f00df3a24464fb34406b06f5ac8f9e09f799100
+EBUILD atop-2.3.0-r1.ebuild 1828 BLAKE2B f8842470b2eb6ac512ccbb73c376dab6b882d119ee0d010bf09878dfb099cf50b81685771552c0c5c7df93cbd5faf2dfef7e50265c1d8b968d713bd521798900 SHA512 7df239077f9656e145c701082ae82c0cd2664cd5772139704a1fbfe046a5d471af6e00a966c60507ebe33f55dd789ca3223a21a7a95a57835a1e18f00a55ad1f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/atop/atop-1.27_p3.ebuild b/sys-process/atop/atop-1.27_p3.ebuild
deleted file mode 100644
index 7e615c59c184..000000000000
--- a/sys-process/atop/atop-1.27_p3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-MY_PV=${PV//_p/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Resource-specific view of processes"
-HOMEPAGE="https://www.atoptool.nl/"
-SRC_URI="https://www.atoptool.nl/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="sys-process/acct"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/s: = -O : += :' \
-		-e '/^LDFLAGS/s: = : += :' \
-		-e 's:\<cc\>:$(CC):' \
-		Makefile
-	tc-export CC
-	cp "${FILESDIR}"/atop.rc atop.init
-	chmod a+rx atop.init
-	sed -i 's: root : :' atop.cron #191926
-}
-
-src_install() {
-	emake DESTDIR="${D}" INIPATH=/etc/init.d install || die
-	# useless -${PV} copies ?
-	rm -f "${D}"/usr/bin/atop*-${PV}
-	dodoc README "${D}"/etc/cron.d/*
-	rm -r "${D}"/etc/cron.d || die
-}
diff --git a/sys-process/atop/atop-2.2.ebuild b/sys-process/atop/atop-2.2.ebuild
deleted file mode 100644
index 2c3035fb4f8f..000000000000
--- a/sys-process/atop/atop-2.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs systemd
-
-MY_PV=${PV//_p/-}
-MY_P=${PN}-${MY_PV}-3
-
-DESCRIPTION="Resource-specific view of processes"
-HOMEPAGE="https://www.atoptool.nl/"
-SRC_URI="https://www.atoptool.nl/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	sys-libs/ncurses
-	sys-process/acct
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2-build.patch
-	epatch "${FILESDIR}"/${PN}-2.2-sysmacros.patch #580372
-	tc-export CC PKG_CONFIG
-	sed -i 's: root : :' atop.cronsysv || die #191926
-	# prefixify
-	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile
-}
-
-src_install() {
-	emake DESTDIR="${D}" genericinstall
-	# useless -${PV} copies ?
-	rm -f "${ED}"/usr/bin/atop*-${MY_PV}
-	newinitd "${FILESDIR}"/${PN}.rc-r1 ${PN}
-	newinitd "${FILESDIR}"/atopacct.rc atopacct
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dounit "${FILESDIR}"/atopacct.service
-	dodoc atop.cronsysv AUTHOR ChangeLog README
-}
diff --git a/sys-process/atop/atop-2.3.0-r1.ebuild b/sys-process/atop/atop-2.3.0-r1.ebuild
index e0a0640ed94f..5bf2b3134865 100644
--- a/sys-process/atop/atop-2.3.0-r1.ebuild
+++ b/sys-process/atop/atop-2.3.0-r1.ebuild
@@ -49,13 +49,13 @@ src_prepare() {
 	tc-export CC PKG_CONFIG
 	sed -i 's: root : :' atop.cronsysv || die #191926
 	# prefixify
-	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile
+	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" genericinstall
 	# useless -${PV} copies ?
-	rm -f "${ED%/}"/usr/bin/atop*-${PV}
+	rm "${ED%/}"/usr/bin/atop*-${PV} || die
 	newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
 	newinitd "${FILESDIR}"/atopacct.rc atopacct
 	systemd_dounit "${FILESDIR}"/${PN}.service
diff --git a/sys-process/atop/atop-2.3.0.ebuild b/sys-process/atop/atop-2.3.0.ebuild
deleted file mode 100644
index 31cb7439dd37..000000000000
--- a/sys-process/atop/atop-2.3.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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"
-
-# Tarballs lacks version.{c,h} files
-SRC_URI+=" https://github.com/Atoptool/atop/commit/42e86fcc42ce60f8c92f3c7d5f3a6ccde47c0b33.patch -> ${PN}-2.3.0-version_h.patch"
-SRC_URI+=" https://github.com/Atoptool/atop/commit/a8d850d06efc8d70a19f55ec93fe83df51e99077.patch -> ${PN}-2.3.0-version_c.patch"
-SRC_URI+=" https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd672631b6033c36c1.patch -> ${PN}-2.3.0-netatop_h.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-process/acct
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-build.patch
-	"${FILESDIR}"/${PN}-2.2-sysmacros.patch #580372
-
-	# taken from upstream.
-	"${DISTDIR}"/${P}-version_{h,c}.patch
-	"${DISTDIR}"/${P}-netatop_h.patch
-)
-
-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
-}
-
-src_install() {
-	emake DESTDIR="${D}" genericinstall
-	# useless -${PV} copies ?
-	rm -f "${ED%/}"/usr/bin/atop*-${PV}
-	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.rc b/sys-process/atop/files/atop.rc
deleted file mode 100644
index f05db6a0e15b..000000000000
--- a/sys-process/atop/files/atop.rc
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
-	ebegin "Starting atop"
-	start-stop-daemon --start --quiet --exec /etc/atop/atop.daily
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping atop"
-	start-stop-daemon --stop --exec /usr/bin/atop --pidfile /var/run/atop.pid
-	eend $?
-}
diff --git a/sys-process/atop/files/atop.rc-r1 b/sys-process/atop/files/atop.rc-r1
deleted file mode 100644
index c5172283a212..000000000000
--- a/sys-process/atop/files/atop.rc-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Resource-specific view of processes"
-pidfile="/var/run/atop.pid"
-command="/etc/atop/atop.daily"
-command_background="true"