4 files changed, 66 insertions, 19 deletions
diff --git a/sys-process/atop/ChangeLog b/sys-process/atop/ChangeLog
index e46dcee8e6a2..c69a836e1ef0 100644
--- a/sys-process/atop/ChangeLog
+++ b/sys-process/atop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/atop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/ChangeLog,v 1.33 2010/05/18 17:17:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/ChangeLog,v 1.34 2010/07/18 22:19:27 vapier Exp $
+
+*atop-1.25-r1 (18 Jul 2010)
+
+  18 Jul 2010; Mike Frysinger <vapier@gentoo.org> +atop-1.25-r1.ebuild,
+  files/atop.rc:
+  Delete copies of binaries with -${PV} suffix and rewrite init.d script
+  #320433 by Jeroen Roovers.
 
 *atop-1.25 (18 May 2010)
 
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index 2c41dbd8c988..e7614bf03482 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -1,11 +1,20 @@
-AUX atop.rc 611 RMD160 52aae70d59d625ef4f4a673659c3d66c9a3e90a3 SHA1 77f09d17d76e226bb205eaa90c5c9b894c154dae SHA256 44c32f5dbffee01bb243c2e0a7775b6bf562d87c93fe2e1f008a2440e1a5b6fb
-DIST atop-1.21.tar.gz 157637 RMD160 b788857c3af48b15b850e05e78c240acef0d3d10 SHA1 357821f841cb65811cd09263a00cf536db869766 SHA256 2ae0108907f7ff8238ec0d9c1cc2712b4581be65da7eb1f7a625afa3df067b57
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX atop.rc 459 RMD160 c249ffb415fc3fd770fa751c50516e148552076a SHA1 42a06b6bff045d0400df47f917244bfed745d8de SHA256 99b1d6f13fb16fce81008d2e43315212d8c81645dacf29a04067b5c82c0d753a
 DIST atop-1.23.tar.gz 174352 RMD160 56165f13a24771a042ba0608bd6839a314446665 SHA1 9a1eb0e8d60e94e147a926ad684f5a35f9fe4463 SHA256 20fa6dc87d9c032dc550ed65314e20a0f12963ec89e8678a620d93a3f348cbc6
 DIST atop-1.24.tar.gz 206916 RMD160 eb41dc26292592aa7f6d4c580cf9df72340b9b32 SHA1 0332ffe2e8a25288f9f1c8476102562605b3ada7 SHA256 ce24900764862387277338c5491a4fa7231230a8dee48800ac3f7ac1a2f1aa71
 DIST atop-1.25.tar.gz 223507 RMD160 4ad206c66633a230cfb7383757e2f72e91c34f0d SHA1 8c48599dba87ad6aefb9a4f8f9517460026ce2b2 SHA256 ddb857a57131f6ec15f01de09bed91fee59ed744ace2718ff0219a82d9b0393c
-EBUILD atop-1.21.ebuild 779 RMD160 aa4c32de69cce6f4b9b9b3019c277563fda67c8a SHA1 609fce2b6a0af88d82dcbab568da3488bc8e7050 SHA256 313e9f419757e6b7416b5bdeafbae4b76e2e4cae02f260c4f41170e23d3daea6
 EBUILD atop-1.23.ebuild 781 RMD160 f2ac1a1077d4ecbfe01a0ee8d9b30943fb941f66 SHA1 ed23bb1266c35e5c635f74e608398ac0f35491a4 SHA256 d6c457ed1f995df18574abddc6d463ebae9c41d714f002aa3470bce637a4272e
 EBUILD atop-1.24-r1.ebuild 884 RMD160 788ea156c0783a7a4c39a265bd81383eeaea94a9 SHA1 b43f159ba65356267d9e4c24acb41cadcf1ec856 SHA256 0cc8cf39b48af66b078db85db1b9d8931a112df4840b72129de63e658084ee16
+EBUILD atop-1.25-r1.ebuild 945 RMD160 a77c9a9208011e2e752357c31aa5fc670d7032ff SHA1 a6ef42e20c78613d5ba5e5f5e67af1d76733f11a SHA256 218ba113fe735532c1f4bebbee4a1f16bba888492c6889c8b6de4a45f54a0fb7
 EBUILD atop-1.25.ebuild 878 RMD160 b628588adcbf688bca80a0efde17f1130cc73eae SHA1 85433715d49fe1d995a30273bea88a428f703a21 SHA256 6cdeeb95a216ae93ceab0b1dd52ce586a62cc051963ae0efeba2ca84ae8080df
-MISC ChangeLog 4497 RMD160 2fc9372cb99a0da653e2fadd19d1b0b263642eb8 SHA1 01838286ff894ac205ff9b06249e5639ce2dc5e3 SHA256 bd94cb567b302591e968d14a1ed4ddf75f1d62bd450f6fb9da63b5fa19253d80
+MISC ChangeLog 4721 RMD160 2fa9f10ff1c68a13f91649ce3d65a86ac585be5d SHA1 d1786a347f79685830fdc0ec488707bce5604ca4 SHA256 db55777bfca660103a9c23706cfc91201d96aab29db445ff5a5f746ea76355a6
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkxDfUAACgkQTwhj9JtAlp7GhgD+PNAJvWtJUO2zSb3V9iKwqlGc
+Y4e7LQzGziAlOoqAOFkBAI2WSxzcuL7IeLi64pPyUnh5vx6+PHEeWkQyegWJ7HHS
+=1mk7
+-----END PGP SIGNATURE-----
diff --git a/sys-process/atop/atop-1.25-r1.ebuild b/sys-process/atop/atop-1.25-r1.ebuild
new file mode 100644
index 000000000000..256fbc101172
--- /dev/null
+++ b/sys-process/atop/atop-1.25-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/atop-1.25-r1.ebuild,v 1.1 2010/07/18 22:19:27 vapier Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="Resource-specific view of processes"
+HOMEPAGE="http://www.atoptool.nl/"
+SRC_URI="http://www.atoptool.nl/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-process/acct"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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/files/atop.rc b/sys-process/atop/files/atop.rc
index 8a6b71587029..a6502fa941c2 100644
--- a/sys-process/atop/files/atop.rc
+++ b/sys-process/atop/files/atop.rc
@@ -1,23 +1,16 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/files/atop.rc,v 1.1 2005/06/14 23:01:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/files/atop.rc,v 1.2 2010/07/18 22:19:26 vapier Exp $
 
-start(){
+start() {
 	ebegin "Starting atop"
-	if [ -f /etc/cron.d/atop ] ; then
-		start-stop-daemon --start --quiet --exec /etc/atop/atop.daily
-		eend $?
-	else
-		eend 1 "/etc/cron.d/atop doesnt exist!"
-	fi
+	start-stop-daemon --start --quiet --exec /etc/atop/atop.daily
+	eend $?
 }
 
-stop(){
+stop() {
 	ebegin "Stopping atop"
-	PIDATOP=`ps -lef | grep -- '-w /var/log/atop/atop_' | grep -v grep | awk '{print $4}'`
-	if [ "$PIDATOP" != "" ] ; then
-		kill $PIDATOP
-	fi
+	start-stop-daemon --stop --exec /usr/bin/atop --pidfile /var/run/atop.pid
 	eend $?
 }