cleanup

(Portage version: 2.1.2-r1)

5 files changed, 15 insertions, 61 deletions

diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index 9088fc1c35b3..4f8c86f71500 100644
--- a/net-analyzer/bmon/ChangeLog
+++ b/net-analyzer/bmon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/bmon
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.31 2007/02/01 19:18:23 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.32 2007/02/01 21:29:46 jokey Exp $
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/bmon-2.1.0-nostrip.patch, -files/bmon-nostrip.patch,
+  -bmon-2.1.0.ebuild, bmon-2.1.0-r2.ebuild:
+  cleanup
 
   01 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> bmon-2.1.0.ebuild:
   Removing sparc keywords, see #105527
diff --git a/net-analyzer/bmon/bmon-2.1.0-r2.ebuild b/net-analyzer/bmon/bmon-2.1.0-r2.ebuild
index 36a8fcbf6019..59b5b2d6583b 100644
--- a/net-analyzer/bmon/bmon-2.1.0-r2.ebuild
+++ b/net-analyzer/bmon/bmon-2.1.0-r2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0-r2.ebuild,v 1.8 2006/08/19 12:56:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0-r2.ebuild,v 1.9 2007/02/01 21:29:46 jokey Exp $
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="interface bandwidth monitor"
 HOMEPAGE="http://people.suug.ch/~tgr/bmon/"
 SRC_URI="http://people.suug.ch/~tgr/bmon/files/${P}.tar.gz"
+
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="amd64 hppa ~ppc x86"
@@ -19,23 +20,21 @@ DEPEND=">=sys-libs/ncurses-5.3-r2
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 	# gcc4 fix, bug 105343
-	epatch ${FILESDIR}/${P}-gcc4.diff
-
+	epatch "${FILESDIR}"/${P}-gcc4.diff
 	# Don't strip, bug #144370
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-nostrip.patch
+	epatch "${FILESDIR}"/${P}-nostrip.patch
 }
 
 src_compile() {
 	econf \
 		$(use_enable dbi) \
-		$(use_enable rrdtool rrd) || die
-	emake CPPFLAGS="${CXXFLAGS} -I${WORKDIR}/libnl-${NLVER}/include" || die
+		$(use_enable rrdtool rrd) || die "econf failed"
+	emake CPPFLAGS="${CXXFLAGS} -I${WORKDIR}/libnl-${NLVER}/include" || die "emake failed"
 }
 
-
 src_install() {
-	make DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc ChangeLog
 }
diff --git a/net-analyzer/bmon/bmon-2.1.0.ebuild b/net-analyzer/bmon/bmon-2.1.0.ebuild
deleted file mode 100644
index e1bd91cb0046..000000000000
--- a/net-analyzer/bmon/bmon-2.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0.ebuild,v 1.5 2007/02/01 19:18:23 gustavoz Exp $
-
-inherit toolchain-funcs
-
-NLVER=0.5.0
-DESCRIPTION="interface bandwidth monitor"
-HOMEPAGE="http://people.suug.ch/~tgr/bmon/"
-SRC_URI="http://people.suug.ch/~tgr/bmon/files/${P}.tar.gz
-	http://people.suug.ch/~tgr/libnl/files/libnl-${NLVER}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.3-r2"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:LIBNL=\":LIBNL=\"-L${WORKDIR}/libnl-${NLVER}/lib :" \
-		-e "s:LIBS=\"-lnl:LIBS=\"-L${WORKDIR}/libnl-${NLVER}/lib -lnl:" \
-		 ${S}/configure
-}
-
-src_compile() {
-	cd ${WORKDIR}/libnl-${NLVER}
-	econf || die
-	emake || die
-
-	cd ${S}
-	econf || die
-	emake CPPFLAGS="${CXXFLAGS} -I${WORKDIR}/libnl-${NLVER}/include" || die
-}
-
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc ChangeLog
-
-	cd ${WORKDIR}/libnl-${NLVER}
-	make DESTDIR=${D} install || die
-}
diff --git a/net-analyzer/bmon/files/bmon-nostrip.patch b/net-analyzer/bmon/files/bmon-2.1.0-nostrip.patch
index c3bb69385af5..c3bb69385af5 100644
--- a/net-analyzer/bmon/files/bmon-nostrip.patch
+++ b/net-analyzer/bmon/files/bmon-2.1.0-nostrip.patch
diff --git a/net-analyzer/bmon/files/digest-bmon-2.1.0 b/net-analyzer/bmon/files/digest-bmon-2.1.0
deleted file mode 100644
index 79dd152736b3..000000000000
--- a/net-analyzer/bmon/files/digest-bmon-2.1.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3111a027907016c0902d67350c619df6 bmon-2.1.0.tar.gz 270287
-RMD160 7e0a5e0a82bfd3dc30fec899088f2206a75796a0 bmon-2.1.0.tar.gz 270287
-SHA256 36a5772fc0241298b15db3dc4fb2552dcbb43edeffd6fcea4cd8818e97ec99fe bmon-2.1.0.tar.gz 270287
-MD5 c58ec5032f393f569ef7f489436651b3 libnl-0.5.0.tar.gz 163375
-RMD160 e026591700b360ae440f4c894ad093416d7cb220 libnl-0.5.0.tar.gz 163375
-SHA256 89a6b5086987460ddd9b24723f35a3a951ccf2886cabe26bef89b8c53528fec5 libnl-0.5.0.tar.gz 163375