summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-12-13 18:39:00 +0000
committerJeroen Roovers <jer@gentoo.org>2011-12-13 18:39:00 +0000
commit010071a390da3957bfb97da8107dc62a6ebba43f (patch)
tree0790464e7b893b322a4bab802e45542aa260ac85 /sys-process
parentImprove die-EAPI checking code. (diff)
downloadgentoo-2-010071a390da3957bfb97da8107dc62a6ebba43f.tar.gz
gentoo-2-010071a390da3957bfb97da8107dc62a6ebba43f.tar.bz2
gentoo-2-010071a390da3957bfb97da8107dc62a6ebba43f.zip
Version bump.
(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/nmon/ChangeLog8
-rw-r--r--sys-process/nmon/nmon-13g.ebuild35
-rw-r--r--sys-process/nmon/nmon-14g.ebuild (renamed from sys-process/nmon/nmon-14a.ebuild)13
3 files changed, 13 insertions, 43 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/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
}