Version bump. Added rewritten init script to fix bug #553246

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

6 files changed, 157 insertions, 6 deletions

diff --git a/sys-process/atop/ChangeLog b/sys-process/atop/ChangeLog
index e4807210ee89..9c0b7155a6d4 100644
--- a/sys-process/atop/ChangeLog
+++ b/sys-process/atop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/atop
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/ChangeLog,v 1.50 2014/12/01 12:34:41 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/ChangeLog,v 1.51 2015/06/25 21:13:42 polynomial-c Exp $
+
+*atop-2.2 (25 Jun 2015)
+
+  25 Jun 2015; Lars Wendler <polynomial-c@gentoo.org> +atop-2.2.ebuild,
+  +files/atop-2.2-build.patch, +files/atop.rc-r1, +files/atopacct.rc:
+  Version bump. Added rewritten init script to fix bug #553246.
 
   01 Dec 2014; Jeroen Roovers <jer@gentoo.org> files/atop-2.1-build.patch:
   Fix building against sys-libs/ncurses[tinfo] (bug #531326).
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index e850a58b18dd..544ebdaf0feb 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -3,19 +3,34 @@ Hash: SHA256
 
 AUX atop-2.0.2-build.patch 667 SHA256 c5920ecc432fd2159e2be0cad5cb937dda054ab5ab6045ca941a76592e228fa0 SHA512 fe35e0a6e4b4eea6baec939924d84e8a866c2a34a855594ada33369f89e66f1cff42f4543c3cbeacfbdeadc25d6b1210d4e951d50fdb631396a93633a0ecabc6 WHIRLPOOL f7ca88bfc99ddedeedc4c25ee00aa90149a532689ffa970e6ec09be8e2bf201398f57a386f2b93273a07ac8454b9857f29f7096664b895b099f9979e053494c8
 AUX atop-2.1-build.patch 1241 SHA256 d9ea2943d284e2ccf14113ecebb3097096ad4007fa320f22cb4431fe1d759a73 SHA512 b0c2ebaa885e5084dd61345adfc12cc58046d983b926cbaba0f4d220ae7a2392a50fec4b7ce4cbf76c0561f938c39bf34291ce14caec9492281f3b5fec107b6a WHIRLPOOL bbe4e630852338fa981906d796ae2fc5b4584045bdcb09740b3e3a67cc1c51c9c948a0de316af460b80de3d92f5562fd3a977480887b325e18841a47060e801e
+AUX atop-2.2-build.patch 898 SHA256 2fe09911e7f53509b68e39038ceef60674e66ab6f9f9fd5bd2fcabc14c7f5edf SHA512 f291cf34d975367f0e972b7fb62f8c91234d0d8da2c903f82e18f160f435e8e8a57ad7eeb5ef9c438e6a5f86c0e9c237d518a4fe09dcf43dcfa5ff39ab769ffc WHIRLPOOL 9ff3caa69d4210d54da2ce2ad793172b04ceb5a067a94b4f2a532ea46339e21cc3fc12cf67a6b6983009efa5dcd19c9240188236a514863c83c67cdc66daf6e8
 AUX atop.rc 459 SHA256 99b1d6f13fb16fce81008d2e43315212d8c81645dacf29a04067b5c82c0d753a SHA512 29099fb770a44bdd94795a321e8c27a92a1ce059952e7d05da092e6f0c1630458470ff4654db9945b6babad92c14785968e6a6444d38e35390400cca3ee3df28 WHIRLPOOL 0b7b6de2adc1a42279952bc17075aa2266596b4e9b215aabf85d8dd75bb62f01093034d98b47ef78decbec59985a6fbdba6e52ea5eac2b945fc9870f1bd2dc7e
+AUX atop.rc-r1 468 SHA256 aa0c73434f9ec3aebc794c916704249244bf31334041d5bb58eb70e71e112333 SHA512 7bee587efb3504eec6a99f48c87167d115f47eeed940a43af08de238f7cf9ffa11d9daf9c4cd42839f8fb464c3de44eeca026b3fd3cd9ce282e378a78e3ef8c3 WHIRLPOOL 474d402a7971ada31f0b79e6999e4b463662f1f708f10b8f2a1420f33106f94a2d649e6c0d0b6f4dc1b4cd776483e551be9980f9e934283595f8bc0aa3e832c6
+AUX atopacct.rc 1168 SHA256 cc8050937a99a92a2069f853041cb355c457509ced4c5afa603a7c62a42b2dcf SHA512 b0b8d3b462f0c71b45c631fd9e112f5b06f01d5454ba9df5daf2587211b480d4006efd486efd90ab588d4463fedc101a0590c1c28b2582ab569f2e90b4866370 WHIRLPOOL 7c2e40ab3645e55aba859952b1a51b2ac8e1498b7933e162e7acf4687751b47fe26faf1415d1cbe522d3521d829e654bb83ff25cb6dfd66b7980f2b92325e0dc
 DIST atop-1.27-3.tar.gz 159521 SHA256 bce36e0b50f0e03995d86d25dbc9ab4a289f6755ce3558844f96d41b0bba563f SHA512 59100b61ff14ff49d8daf815abdbf5e9f905767fe8532b0043f3a63acc4d37975201879a93634f6e77edd307e8b6e7d0bf1a3caff1a3cdce8240e92e46023003 WHIRLPOOL 51ceae010e8cd9172d55ab970fcfe90db1ac6d831db14ece17598dba8395c2f8a7e840513e4d07f5f7ad12e28cfc956a8d04619d4e73d7009a6c5a52a62be7d2
 DIST atop-2.0.2.tar.gz 166887 SHA256 a620dbe0de7c7ee004949b201bed27559a8dd6cbdee651c7a3e15fc584723409 SHA512 c02b1c2ebf5c49fb0ad17bbcf0b86af8e5623c8d0b6ba8b1096d9b592cbb358e011933142cdebc90f619221785e859aaa009a338f3682d8bfa4340a50b308471 WHIRLPOOL 1f650210c7f0d79545ad268d5482f950d080aaff51a6045fa710ffc4c359f786cf27ebf88a1dfca87a402b63f8ea9dc7d0542e1949096744a30ca3620708e575
 DIST atop-2.1-1.tar.gz 181301 SHA256 39a2d4febc338dd4147904b1496d1aa9513da0d22ad0602b66023452bdc7989f SHA512 89b33c9a299213faa42c8ee4393c9588c0dbe7940f8709a617d51d6202525a7e7385299242c8c032d573dea9fa631e705d8edfb4685414d35169b773e1290613 WHIRLPOOL 9f02afd797d25a28e873c25f6f03a2607628d60a7ef493b034a63707bc4b5fcd7d4d2d2f2c18b69312f19c5104639176e4816ebfd7282d53dd819786e45280d5
+DIST atop-2.2-3.tar.gz 194168 SHA256 c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d SHA512 34076e35004367bbfd63f3aac1e786dab566633799b5d4f2c4d45f343642d145027f6298aa40d5e83c1356f502e3c51faa58da07cea58f2960bfacd78cf77915 WHIRLPOOL 2798ebaf5affc9d929a0b5663c1caa6d64a52e00d20f496373f34e48c592fe168c8c20c9df3c309a3057f9eb7baa3409f2cbfbedf110adb9fef51d0774d8d3e2
 EBUILD atop-1.27_p3.ebuild 1026 SHA256 40de6d8b14196dfe2d7947b73042ed05df72787fa7ba87ccf6365ce5ed15aee6 SHA512 212de4c30f5ada2f2f109875798f82749a911976781511effec29fc842cd50102fd3430b6f2c52187249ed2730d5548864e5aab4a89440c085254ecabe088c9a WHIRLPOOL f5a06d186a61a9bf8fedc56055bccef7b78ed3230f7be8684a2d3b056cb74a6d3859648131ba4603a3a203f2974744af27f4085af122f70c924b68b59bdcfb21
 EBUILD atop-2.0.2.ebuild 1075 SHA256 1d9cc4016db08b15d696aace97fafbbe521549cf787748bf4a94f3149e25f3fd SHA512 22eab884dbdcf8e564be1918a7b8cda7b351fa1acaf1245f8db8ff8bd630479cabbda85370679daa6f57f2fbc40eeb2f2bc76ac29e38a07f42146155b0b36c01 WHIRLPOOL 1122fb6f7b460662b5d7ef476f92cf1a9247083934ccf3cc4893a5f1a64a3ca6f261d5ee655426bd2a786fdf789b4da6dc20612a129c64ff6e34efb00fcc36e5
 EBUILD atop-2.1.ebuild 1082 SHA256 816b997d6609d2817d069d381b5bb6e9dd731f954ab815903b2367ce3501f32e SHA512 25dec885e000f92f64a9882ec73b66c9550cdf5a8c32345cabe87ba60660b780b4e1f0061b4116331f9c2187d96c83e78d35a9110179b521dd1e898337721958 WHIRLPOOL 0d5472873d73c527eefdff028ed197aa155cfd96c97dc513fa8611ea4e7392094a4fb7e1aa906a9a8a86c8fd67388bd47cfca4233d9a9c9ead1f317530d52555
-MISC ChangeLog 6897 SHA256 36ae4ca34ca9a558522d512c15572823e32d7b357ff7f03f9d1c40a5506cdf0b SHA512 a039326ec6603a9176879bd565e30297c969f3cfd869a65fc3e659f07e85fe354ef3b36bf1cd90f96c9a492598954b4d6e17bf8d16fad20fb2a6a09470ccff27 WHIRLPOOL 888e23f942304c6d54f9d37c2766d812f6bbae48ef07dc2a8c8261834f552f1645f18f69c001bb6bda1cd79a0a7a4c561bb0e01858d9d1558e5d08f3b0849575
+EBUILD atop-2.2.ebuild 1137 SHA256 7935450bef0079d7ecd93fe9949beafc3a5dd323215872830d56e8c208d1fcb2 SHA512 513148ee50eaeca5aee5c2e0681c21c4cd62545f7558a9b8d77518aa9c9a94acad20c5a392116e22344c5079a0fdd4207308601cd6ac1aa84bbd8323d0eb955d WHIRLPOOL 6808d0927b8c9367fd3e314e47b5218dcfd23f88d7a24a7d9b02cf882edf12f6554b816ab679735b5831f906b63e054037f6c0d6a5a5394bb465f2602bac7981
+MISC ChangeLog 7138 SHA256 3595efe1be63a2bee628925a052a4858f3aab248eee3c3d81cc2102aa2ee821c SHA512 08f177d5148578b4c0034e8a54b5f507b658b0174d81f5a80ead1bd8e0a77112284f202f3eebbfbd6077fa30f205179f3027bad62e39a8da7012d110b0dd57e3 WHIRLPOOL 8af38d37c852f8f57ae507f1598820b94011ed6f35f9ac0787f47ec07fa2b9e893485861f5ca748505e4004a3bfaa49b29537cd428c28b471398f164968129f9
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR8YGIACgkQVWmRsqeSphMRmQCdEDdY4JT92rijtyieFUXMFH/t
-HE0AoIEN8DjNyMxrSD6h7GBFStsTjOuu
-=ov/h
+iQIcBAEBCAAGBQJVjG8HAAoJEPiazRVxLXTFBm4P/jyw+TEiYL2z6VoZKxf669cd
+Ug3V8I+Z7SS92JkfDzqwW1hWGkdeyo7EHF4usIBORHALE3ovwu4nkeLslAmL219u
+30ujTSkQKssIZCgbkuRASVfgNHZcdAnl4pTPZ1inNUrkkDaDkpE95Wrc+EoK1B44
+z0fBv5lpiym/PJeBUeBGmR6UcFtnxhydnB+iZ8GdNOq/cEyO6Ie8Q1C9iVcR3oDz
+eHtBTCdQP6wmYs+gLzmALgb69G30zap78j++LDDDdxrqEEd7s86V+K/nO475RGxN
+QzttqcFA7PbhI9CqLjK03dReQ/vs4b/0/EKoBkLnFQ3wDsxF/upP4OgIKcJJKquz
+dZk4lYF91oKDbCKd0f459sCQiHnuSCeWxO4TvI0C7OgSF3jMkqm8/SCOpxhm4K2J
+i6tB3O/Xia+WoMtV8uRtPZYupsvQpY3o506Gtv5QJ9QpJuZOwfbqo1U3KHJ4Svb+
+l4LO0i2jCOBAaJPBdG6/nBDD5VJmGrD9b1CWwczhsiflcQ+UTqSl3lxYT43CPhmj
+nO+DjtPC5XuMKUYEFDVUES+W+PqzIOyrx3XHYnvHmvS3H/kXsv0jJvxAEj0FEW5h
+fEu4IKr0GUITj+TQaJKwcExxhwtVBidicFovlLkNpnsh8XJGHnMg5hU2/oNdE1dU
+1O5M5SUHdpMBxxB0cTWi
+=m6Tb
 -----END PGP SIGNATURE-----
diff --git a/sys-process/atop/atop-2.2.ebuild b/sys-process/atop/atop-2.2.ebuild
new file mode 100644
index 000000000000..a175fe507a63
--- /dev/null
+++ b/sys-process/atop/atop-2.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/atop-2.2.ebuild,v 1.1 2015/06/25 21:13:42 polynomial-c Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_PV=${PV//_p/-}
+MY_P=${PN}-${MY_PV}-3
+
+DESCRIPTION="Resource-specific view of processes"
+HOMEPAGE="http://www.atoptool.nl/"
+SRC_URI="http://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
+	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
+	dodoc atop.cronsysv AUTHOR ChangeLog README
+}
diff --git a/sys-process/atop/files/atop-2.2-build.patch b/sys-process/atop/files/atop-2.2-build.patch
new file mode 100644
index 000000000000..70840a25330a
--- /dev/null
+++ b/sys-process/atop/files/atop-2.2-build.patch
@@ -0,0 +1,27 @@
+--- atop-2.2-3/Makefile
++++ atop-2.2-3/Makefile
+@@ -19,7 +19,7 @@
+ PMPATH2  = /usr/lib64/pm-utils/sleep.d
+ PMPATHD  = /usr/lib/systemd/system-sleep
+ 
+-CFLAGS  += -O2 -I. -Wall  	 # -DHTTPSTATS
++CFLAGS  += -I. -Wall  	 # -DHTTPSTATS
+ OBJMOD0  = version.o
+ OBJMOD1  = various.o  deviate.o   procdbase.o
+ OBJMOD2  = acctproc.o photoproc.o photosyst.o  rawlog.o ifprop.o parseable.o
+@@ -32,13 +32,13 @@
+ all: 		atop atopsar atopacctd
+ 
+ atop:		atop.o    $(ALLMODS) Makefile
+-		$(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
+ 
+ netlink.o:	netlink.c
+ 		$(CC) -I. -Wall -c netlink.c
diff --git a/sys-process/atop/files/atop.rc-r1 b/sys-process/atop/files/atop.rc-r1
new file mode 100644
index 000000000000..e40551c1fa9a
--- /dev/null
+++ b/sys-process/atop/files/atop.rc-r1
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/files/atop.rc-r1,v 1.1 2015/06/25 21:13:42 polynomial-c Exp $
+
+description="Resource-specific view of processes"
+pidfile="/var/run/atop.pid"
+command="/usr/bin/atop"
+
+start() {
+	ebegin "Starting atop"
+	start-stop-daemon --start --pidfile ${pidfile} \
+		--exec /etc/atop/atop.daily
+	eend $?
+}
diff --git a/sys-process/atop/files/atopacct.rc b/sys-process/atop/files/atopacct.rc
new file mode 100644
index 000000000000..e665ca9928df
--- /dev/null
+++ b/sys-process/atop/files/atopacct.rc
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/files/atopacct.rc,v 1.1 2015/06/25 21:13:42 polynomial-c Exp $
+
+description="Resource-specific view of processes"
+command="/usr/sbin/atopacctd"
+lockfile="/var/lock/subsys/atopacctd"
+
+start_pre() {
+	# Check if process accounting already in use via psacct
+        for PACCTFILE in /var/account/pacct /var/log/pacct ; do
+                if [ -f "${PACCTFILE}" ] ; then
+                        BEFORSIZE=$(stat -c %s "${PACCTFILE}")
+                        AFTERSIZE=$(stat -c %s "${PACCTFILE}")
+
+                        # verify if accounting file grows, so is in use
+                        if [ ${BEFORSIZE} -lt ${AFTERSIZE} ] ; then
+				ewarn "Process accounting already used by psacct!"
+				return 1
+			fi
+		fi
+	done
+
+	checkpath -d -q ${lockfile%/*} || return 1
+}
+
+start() {
+	ebegin "Starting atopacctd"
+	start-stop-daemon --start --exec ${command}
+	touch ${lockfile}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping atopacctd"
+	start-stop-daemon --stop --exec ${command}
+	rm ${lockfile}
+	eend $?
+}
+