Version bump.

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

4 files changed, 21 insertions, 55 deletions

diff --git a/sys-process/nmon/ChangeLog b/sys-process/nmon/ChangeLog
index 51712373f62e..0388f8be3860 100644
--- a/sys-process/nmon/ChangeLog
+++ b/sys-process/nmon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/nmon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/nmon/ChangeLog,v 1.3 2011/01/23 23:48:15 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/nmon/ChangeLog,v 1.4 2011/12/13 18:39:00 jer Exp $
+
+*nmon-14g (13 Dec 2011)
+
+  13 Dec 2011; Jeroen Roovers <jer@gentoo.org> -nmon-13g.ebuild,
+  -nmon-14a.ebuild, +nmon-14g.ebuild:
+  Version bump.
 
 *nmon-14f (23 Jan 2011)
 
diff --git a/sys-process/nmon/Manifest b/sys-process/nmon/Manifest
index 7a1dc2869c3a..f249049813cd 100644
--- a/sys-process/nmon/Manifest
+++ b/sys-process/nmon/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST lmon13g.c 160425 RMD160 1880e7de2e00209f9201c20076552ec1d14e7777 SHA1 5e35e88dc13f044bfb7f16abe37b504c0a3bb79b SHA256 456ab2a342b31d1a352d0d940af5962fa65a12ae8757ff73e6e73210832ae8b5
-DIST lmon14a.c 185939 RMD160 fc2309db7cd9d119d7635dcbb89a237b53b63a8a SHA1 e23e2f8991d7206d7e48ddc6874e3be5c81984e1 SHA256 083d6d16e8643844967c418c02cbc2a286a7c4dace71dc665d0ea7a25a0ee878
 DIST lmon14f.c 187562 RMD160 e50760705ee5739aa1748a12e0b0f83b40f30ae6 SHA1 5745f9991051814cb546b7ede6d4aade8467c400 SHA256 9b5f976379b3c5765ac5c2ea975a5d75baa7342eeefb4d291dabdb59195a132e
-EBUILD nmon-13g.ebuild 778 RMD160 3b990fb8c0960e6a84de667202ca2fd6e5b55189 SHA1 8399de858c9b8ffa4b621ee6a328db420d7733a8 SHA256 eb4f71624f515ee070c893964f9c705346b1db7337b4b774aee28496be9a91a4
-EBUILD nmon-14a.ebuild 775 RMD160 ab9d105c4a108645459cbed5d00604cab5792eee SHA1 d7912f3c79f2c1676fa3f3b65c031bb606347e54 SHA256 3e008586a907acfcd8b0b7d6c1a710c636e717fba9ed4e26a742920fda0e0cb7
+DIST lmon14g.c 188371 RMD160 291833c990fcadeb22727d49acc4c7fb15b10d4a SHA1 cb4dbcc22694f3fe51849a45556480cc2caea536 SHA256 f3c062383b9447ed90eb631b8a13045a8dd70c2692f134cc23a81a618f1e5efc
 EBUILD nmon-14f.ebuild 777 RMD160 99baf3d21f076aca46d6c8fec0fc1b3a6d305b2c SHA1 8f009d74fa90d42721f81868979997624d8d206b SHA256 3a88432ddf9294d742993e259289382c554544684bf2055e7e020a439261167e
-MISC ChangeLog 574 RMD160 cd8d92753a37505efc1db871b8f0d492d2c987d7 SHA1 20f8312c918d2aa3e7be2aafdfda989cc41fe860 SHA256 76db952e91987abc16c5871b3e71d0d20363d38a0b8fed423cc0613f14990e48
+EBUILD nmon-14g.ebuild 757 RMD160 db9247c89f7b4afb3763e5df346d67f82ea14a17 SHA1 7148a34d043aacbb8de1ced52a251d8e290a1d61 SHA256 2935a7c6e7e4f79445fdbb67faa1590ac2c29310e23a770b4b2c2585eadd8291
+MISC ChangeLog 717 RMD160 45dc345a7894223c136e812a94b7dcd154185210 SHA1 7a30c84a5e65594824574718039e5e164c52fda9 SHA256 0a8e85c76c9e57d10494e8a98ce0dcde8bbf32084f680c84a2e42174ed25eb12
 MISC metadata.xml 208 RMD160 f781f417049ff1d018c5c597f65316ea8bfa72fc SHA1 977e35254e7bdc0a2d87ec41e96ccba00d9c0d82 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59tW0ACgkQfXuS5UK5QB0ToAP/dR5/7QTdMknZTHs5w0d5GBy+
-K2KrFNLy4CBg/ky35lSSz4MNWJtmaMzFHUwYok87zVxhnymfs4pELfOajzvi5NKf
-Z2uf48Vwi4414uDHoTHBkxxE28iwY80qzTvX4ZTgcG+EJzlG2b+O/NPnIbO6gxrB
-uIy9wewigrLYnuDda7M=
-=yjhV
+iEYEARECAAYFAk7nm8oACgkQVWmRsqeSphMgDACfWIyMXypxLg5Uw23nkBX6OB0/
+iXgAn2ZNs+CPwHekdnLBIpAJCSx3WRHG
+=mH/s
 -----END PGP SIGNATURE-----
diff --git a/sys-process/nmon/nmon-13g.ebuild b/sys-process/nmon/nmon-13g.ebuild
deleted file mode 100644
index 1f202958bc62..000000000000
--- a/sys-process/nmon/nmon-13g.ebuild
+++ /dev/null
@@ -1,35 +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/nmon/nmon-13g.ebuild,v 1.1 2010/08/04 03:24:50 vapier Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Nigel's performance MONitor for CPU, memory, network, disks, etc..."
-HOMEPAGE="http://nmon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/lmon${PV}.c"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}"/lmon${PV}.c "${S}"/nmon.c || die
-}
-
-src_compile() {
-	append-cppflags -DJFS -DGETUSER -DLARGEMEM
-	emake \
-		CC="$(tc-getCC)" \
-		LDLIBS="-lncurses" \
-		nmon || die
-}
-
-src_install() {
-	dobin nmon || die
-}
diff --git a/sys-process/nmon/nmon-14a.ebuild b/sys-process/nmon/nmon-14g.ebuild
index 598f0aa94e2a..864ea7c6b44f 100644
--- a/sys-process/nmon/nmon-14a.ebuild
+++ b/sys-process/nmon/nmon-14g.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/nmon/nmon-14a.ebuild,v 1.1 2010/09/03 01:34:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/nmon/nmon-14g.ebuild,v 1.1 2011/12/13 18:39:00 jer Exp $
+
+EAPI=4
 
 inherit toolchain-funcs flag-o-matic
 
@@ -24,12 +26,9 @@ src_unpack() {
 
 src_compile() {
 	append-cppflags -DJFS -DGETUSER -DLARGEMEM
-	emake \
-		CC="$(tc-getCC)" \
-		LDLIBS="-lncurses" \
-		nmon || die
+	emake CC="$(tc-getCC)" LDLIBS="-lncurses" nmon
 }
 
 src_install() {
-	dobin nmon || die
+	dobin nmon
 }