sys-process/nmon: Updated ebuild.

svn path=/sunrise/; revision=10403

diff --git a/sys-process/nmon/ChangeLog b/sys-process/nmon/ChangeLog
index 4e06769fd66720c4f7960a8841d65b88b05ee1c9..c364ea7d0c5f7f99b6698031cc42b204e75ca7c7 100644 (file)
--- a/sys-process/nmon/ChangeLog
+++ b/sys-process/nmon/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Apr 2010; Piotr Szymaniak <lazy_bum@o2.pl> nmon-13g.ebuild,
+  +files/nmon-13g_makefile:
+  Updated ebuild.
+
   04 Apr 2010; Piotr Szymaniak <lazy_bum@o2.pl> -nmon-12a.ebuild,
   +nmon-13g.ebuild:
   Version bump thanks to Alexander Miroshnichenko (bug #132948).

diff --git a/sys-process/nmon/Manifest b/sys-process/nmon/Manifest
index a57069ac9858a667ee993210616c6958cf356a72..17b735fb72d7ddb57ca688c99d829d86a8abae6c 100644 (file)
--- a/sys-process/nmon/Manifest
+++ b/sys-process/nmon/Manifest
@@ -1,5 +1,5 @@
+AUX nmon-13g_makefile 129 RMD160 cca8301420e2946b3baf9c3263e6497719c3e8ac SHA1 977d32ae231d72ea2af5b46f1f2bd91d33727e1a SHA256 2b0914b8aa97d7584cbeadd7f17282a3aeffca48c2cb389b7019f4b7130ee2ee
 DIST lmon13g.c 160425 RMD160 1880e7de2e00209f9201c20076552ec1d14e7777 SHA1 5e35e88dc13f044bfb7f16abe37b504c0a3bb79b SHA256 456ab2a342b31d1a352d0d940af5962fa65a12ae8757ff73e6e73210832ae8b5
-DIST nmon-13g_makefile 2484 RMD160 1c637bd8017001fb0c9eb56399717b95d5cdba9a SHA1 25d6c5c57d6a6cd88551862367c603b9800533cd SHA256 4573e76d3d9a8604cb980a222fb25376269100c553fb7f0c025e853004efeca7
-EBUILD nmon-13g.ebuild 796 RMD160 62b12ea27aa6685640a1ff3234050937b5e5e72c SHA1 7b334bf9d95686501b22e377c896211e21585acf SHA256 04621546744b0c6a7d29fd2974a03197606f06c28bd8c6a49a26f67ac5dd3ed5
-MISC ChangeLog 413 RMD160 12d8ebbf05afb3276c64219c299af65f11699177 SHA1 c7667e3da4efacf72308e3243b886f978c75aa7b SHA256 69819579c1133a0e411d58be0419ad49c8e0468fdd3e2e3b0a06fbe1411e2e8f
+EBUILD nmon-13g.ebuild 664 RMD160 c383ccc6db4a2141cf19637a53e96bdb490f51c0 SHA1 e13717914bdda4a3aa5b814a826b18552479b3ba SHA256 fa701b85432f3b5989e093d1f812b32edd6d2450ac5a123cab9cb0b8577e5815
+MISC ChangeLog 525 RMD160 7ca53277199ef6122ac060fa2b8304582ae2fc86 SHA1 ca756ee71ebf4a9a208d9c55990fa64a5e2c5724 SHA256 229fb436d04fd1da3d36223fe6b9c766aa5fc461aea1fb6cdc24e43e9d5238bd
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/sys-process/nmon/files/nmon-13g_makefile b/sys-process/nmon/files/nmon-13g_makefile
new file mode 100644 (file)
index 0000000..ef82e0b
--- /dev/null
+++ b/sys-process/nmon/files/nmon-13g_makefile
@@ -0,0 +1,6 @@
+OPTS=-D JFS -D GETUSER -D LARGEMEM
+LIBS=-lncurses
+FILE=lmon.c
+
+nmon:
+       $(CC) -o nmon $(FILE) $(OPTS) $(CFLAGS) $(LDFLAGS) $(LIBS)

diff --git a/sys-process/nmon/nmon-13g.ebuild b/sys-process/nmon/nmon-13g.ebuild
index 4b7cbf7596026876102385cc3163b62d8286174c..d8f4d248b22c5cb34697c697ae8bf2d6ed555356 100644 (file)
--- a/sys-process/nmon/nmon-13g.ebuild
+++ b/sys-process/nmon/nmon-13g.ebuild
@@ -2,33 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=2
+
+inherit toolchain-funcs
 
 DESCRIPTION="Nigel's Monitor - provided by IBM"
 HOMEPAGE="http://nmon.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/lmon${PV}.c
-               mirror://sourceforge/${PN}/makefile -> ${P}_makefile"
+SRC_URI="mirror://sourceforge/${PN}/lmon${PV}.c"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~ppc64 ~amd64"
+KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="sys-libs/ncurses
-               sys-apps/lsb-release"
+DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
 
-src_unpack () {
-       cp ${DISTDIR}/lmon${PV}.c ${WORKDIR}/lmon.c
-       cp ${DISTDIR}/${P}_makefile ${WORKDIR}/makefile
-       echo 'nmon_gentoo:' >> ${WORKDIR}/makefile
-       echo '  cc -o nmon $(FILE) $(CFLAGS) $(LDFLAGS)' "${CFLAGS}" >> ${WORKDIR}/makefile
+src_unpack() {
+       cp "${DISTDIR}"/lmon${PV}.c "${WORKDIR}"/lmon.c || die "cp failed"
+       cp "${FILESDIR}/${P}_makefile" "${WORKDIR}"/makefile || die "cp failed"
 }
 
 src_compile() {
-    emake nmon_gentoo || die "emake failed"
+       emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
-       dobin nmon
+       dobin nmon || die "dobin failed"
 }