Version bump (bug #531212). Removed old

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

5 files changed, 108 insertions, 38 deletions

diff --git a/sys-process/atop/ChangeLog b/sys-process/atop/ChangeLog
index 95ef48446bbd..6eaaa4a543c9 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.48 2014/10/28 21:52:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/ChangeLog,v 1.49 2014/11/30 13:47:18 polynomial-c Exp $
+
+*atop-2.1 (30 Nov 2014)
+
+  30 Nov 2014; Lars Wendler <polynomial-c@gentoo.org> -atop-1.23.ebuild,
+  +atop-2.1.ebuild, +files/atop-2.1-build.patch:
+  Version bump (bug #531212). Removed old.
 
   28 Oct 2014; Jeroen Roovers <jer@gentoo.org> atop-2.0.2.ebuild,
   files/atop-2.0.2-build.patch:
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index b1b958421787..ba2a89877a4c 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -2,19 +2,30 @@
 Hash: SHA256
 
 AUX atop-2.0.2-build.patch 667 SHA256 c5920ecc432fd2159e2be0cad5cb937dda054ab5ab6045ca941a76592e228fa0 SHA512 fe35e0a6e4b4eea6baec939924d84e8a866c2a34a855594ada33369f89e66f1cff42f4543c3cbeacfbdeadc25d6b1210d4e951d50fdb631396a93633a0ecabc6 WHIRLPOOL f7ca88bfc99ddedeedc4c25ee00aa90149a532689ffa970e6ec09be8e2bf201398f57a386f2b93273a07ac8454b9857f29f7096664b895b099f9979e053494c8
+AUX atop-2.1-build.patch 1213 SHA256 6242a2fd21fe27bf9e75082eae02d5c1cadbdd0325e98f2d7d0f54194cfac70d SHA512 5e3f5ef6eb27a8c534acd9ea0536041b44845c0885a1ce63ab0ddcd00f5a4cd76216f68a2430c1556cc0876167a09f81b303945113604d615cfcdd34f9c3a239 WHIRLPOOL ce7d5376ad6e64174cd882b852020f3694e79b553bc77f5da41bcd25376733189a4c6c2320b25cdb130b7d1b13a2ff71a88e154df99b49cb2d7128f9cf368787
 AUX atop.rc 459 SHA256 99b1d6f13fb16fce81008d2e43315212d8c81645dacf29a04067b5c82c0d753a SHA512 29099fb770a44bdd94795a321e8c27a92a1ce059952e7d05da092e6f0c1630458470ff4654db9945b6babad92c14785968e6a6444d38e35390400cca3ee3df28 WHIRLPOOL 0b7b6de2adc1a42279952bc17075aa2266596b4e9b215aabf85d8dd75bb62f01093034d98b47ef78decbec59985a6fbdba6e52ea5eac2b945fc9870f1bd2dc7e
-DIST atop-1.23.tar.gz 174352 SHA256 20fa6dc87d9c032dc550ed65314e20a0f12963ec89e8678a620d93a3f348cbc6
 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
-EBUILD atop-1.23.ebuild 781 SHA256 d6c457ed1f995df18574abddc6d463ebae9c41d714f002aa3470bce637a4272e SHA512 58d1f90339c06d6a4fd589c26df1e24aafc9d903016eff938ea5f260e25ef786c796333ef650ce0c40450ba2b1526eb3befb7b9d9ff56ef418c15d7cc9d70fef WHIRLPOOL e5adfe3961198f12be442843a5097ce9047b84a2f37751fb448e77c92ae384138817f61d8b251ea9f3dfe6883dc517194623c9d8ceb99a9e673f5674fdb3fb27
+DIST atop-2.1-1.tar.gz 181301 SHA256 39a2d4febc338dd4147904b1496d1aa9513da0d22ad0602b66023452bdc7989f SHA512 89b33c9a299213faa42c8ee4393c9588c0dbe7940f8709a617d51d6202525a7e7385299242c8c032d573dea9fa631e705d8edfb4685414d35169b773e1290613 WHIRLPOOL 9f02afd797d25a28e873c25f6f03a2607628d60a7ef493b034a63707bc4b5fcd7d4d2d2f2c18b69312f19c5104639176e4816ebfd7282d53dd819786e45280d5
 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
-MISC ChangeLog 6568 SHA256 5fb884fa57935a9c9049bec5fd2a83d62c4dfca1ec1e49c300e5941203e04406 SHA512 b14a5f528b721e70c04dfbba5cef6e75b69267a5eda53ac5207b52a2056eff787a20b035ef844503763c8bb942c9cd23d2feb4f2395fc1a8a7cb6ff033298e75 WHIRLPOOL 8b215168688ca3ca7f871c0f00ffbff44bd98172010d35e1dc5d9f7271f9f1e39a67e995e3c980497edb1da849a92506a3dc2f348fb2bff1dd1b9776f44170e9
+EBUILD atop-2.1.ebuild 1082 SHA256 816b997d6609d2817d069d381b5bb6e9dd731f954ab815903b2367ce3501f32e SHA512 25dec885e000f92f64a9882ec73b66c9550cdf5a8c32345cabe87ba60660b780b4e1f0061b4116331f9c2187d96c83e78d35a9110179b521dd1e898337721958 WHIRLPOOL 0d5472873d73c527eefdff028ed197aa155cfd96c97dc513fa8611ea4e7392094a4fb7e1aa906a9a8a86c8fd67388bd47cfca4233d9a9c9ead1f317530d52555
+MISC ChangeLog 6768 SHA256 7299a29925f5099e054daa8c971806ef00cc355984ba84ed41e1f3b9fce8be19 SHA512 614a7e239d8a49b6d0ff39c0739ebab473424b54028443e2a897d6d78acb4d0c8c80a7902687751408808f848547c6fa71091e4134b96bb5afe90bc0a116c069 WHIRLPOOL eb2e987e33b47244e14b482b138a8d448e68e252ca7a22f41f403174c3f6fdd1904b59c6014ef269642a7939d8b4bd8276219be63574bdd9e6ae526987fadf8a
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRQEBsACgkQVWmRsqeSphMZmQCcDcYJ1XPzQz85ziScRvQqYxoU
-2acAniUEY+IrNq+qnaT8rObJ8lg5eE6R
-=EX7j
+iQIcBAEBCAAGBQJUex/nAAoJEPiazRVxLXTFUooP/3PtrI9o8brz3sC9YQUCT0Pn
+trHgqe695/jflb5DbwZ7bQ/poZSKKv4KTq4nGQ6z1VNHM+8E9hUYJrcgwhFqTKKa
+HpC0Rtil1Ogw0NurFWdbQ9dL9z4+iNI88hLb94PZ0361dkuRfhqPzUcUnNfXIUPT
+EM/VrGyDFz/5QNZkrAWeTZ11ezdFdv0lUH3tRrMiVhztT5+u4+tApEToSmHWUetO
+zqfltd5EUgMdP6DD2M68rCmLdftoghV04SdGrxAmnZc2Qsltzf/Ff12IusczG5mT
+CMMbJIWIDLwTItvwyKKWpNPaLAUE6SnVmaZDx8mfiL5TWGBQpbrrnOHV6svclIrI
+fN4roBqUDSJ5jt79Ratd7y2CL6aoF5N3Kn4e9ELGNxKQ4tdFdtbLA2GAlrJol17k
+jZmO/wiK/2/7RVdWfDRQTs3sacMRnWn+T+P+PzOhMkUlPqKsyoDs/8GUlaHnti8Q
+3xTTpm1PS1x6Wdd3wKm9WUVK/LFHNVQ9dwXSK6/0BoS5+aTmxjYorJ/zlggnua5S
+9kjNoSuzAUjrZnZvyFPaWd0+EVeRHsySe77RIBA0CGtZvSuwV5brgJMNeYVuu0xH
+aRGLPfT5Fgq0d18uKA0ks8R/bqxtMQpNoUmvBdwR79aYOtGv1uk5mEly68dxx69Q
+kBWABn95KL9P/F1M+qYh
+=KMxq
 -----END PGP SIGNATURE-----
diff --git a/sys-process/atop/atop-1.23.ebuild b/sys-process/atop/atop-1.23.ebuild
deleted file mode 100644
index 09a8923620ce..000000000000
--- a/sys-process/atop/atop-1.23.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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.23.ebuild,v 1.6 2010/03/29 17:51:11 jer Exp $
-
-DESCRIPTION="Resource-specific view of processes"
-HOMEPAGE="http://www.atcomputing.nl/Tools/atop"
-SRC_URI="http://www.atconsultancy.nl/atop/packages/${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: = : += :' \
-		Makefile
-	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
-	dodoc README
-}
diff --git a/sys-process/atop/atop-2.1.ebuild b/sys-process/atop/atop-2.1.ebuild
new file mode 100644
index 000000000000..47b1cf40e814
--- /dev/null
+++ b/sys-process/atop/atop-2.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/atop-2.1.ebuild,v 1.1 2014/11/30 13:47:18 polynomial-c Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_PV=${PV//_p/-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Resource-specific view of processes"
+HOMEPAGE="http://www.atoptool.nl/"
+SRC_URI="http://www.atoptool.nl/download/${MY_P}-1.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.1-build.patch
+	tc-export CC PKG_CONFIG
+	cp "${FILESDIR}"/atop.rc atop.init
+	chmod a+rx atop.init
+	sed -i 's: root : :' atop.cron #191926
+	# prefixify
+	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile
+}
+
+src_install() {
+	default
+	# useless -${PV} copies ?
+	rm -f "${ED}"/usr/bin/atop*-${PV}
+	dodoc "${ED}"/etc/cron.d/*
+	rm -r "${ED}"/etc/cron.d || die
+}
diff --git a/sys-process/atop/files/atop-2.1-build.patch b/sys-process/atop/files/atop-2.1-build.patch
new file mode 100644
index 000000000000..530b8996f076
--- /dev/null
+++ b/sys-process/atop/files/atop-2.1-build.patch
@@ -0,0 +1,36 @@
+--- atop-2.1/Makefile
++++ atop-2.1/Makefile
+@@ -17,7 +17,7 @@
+ PMPATH1  = /usr/lib/pm-utils/sleep.d
+ PMPATH2  = /usr/lib64/pm-utils/sleep.d
+ 
+-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
+@@ -30,13 +30,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 -lncurses -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
+@@ -49,6 +49,8 @@
+ 			then mkdir -p $(DESTDIR)$(LOGPATH); fi
+ 		if [ ! -d $(DESTDIR)$(BINPATH) ]; 	\
+ 			then mkdir -p $(DESTDIR)$(BINPATH); fi
++		if [ ! -d $(DESTDIR)$(SBINPATH) ]; 	\
++			then mkdir -p $(DESTDIR)$(SBINPATH); fi
+ 		if [ ! -d $(DESTDIR)$(SCRPATH) ]; 	\
+ 			then mkdir -p $(DESTDIR)$(SCRPATH); fi
+ 		if [ ! -d $(DESTDIR)$(MAN1PATH) ]; 	\