From 427f06669ccbd1eb72a8593d2f6625e3b27e5c6d Mon Sep 17 00:00:00 2001
From: Raúl Porcel <armin76@gentoo.org>
Date: Thu, 14 Aug 2008 15:06:06 +0000
Subject: I removed the wrong one, restoring (Portage version: 2.1.4.4, RepoMan
 options: --force)

---
 net-analyzer/bmon/bmon-2.1.0-r2.ebuild             | 40 --------------------
 net-analyzer/bmon/bmon-2.1.0-r3.ebuild             | 43 ++++++++++++++++++++++
 net-analyzer/bmon/files/bmon-2.1.0-libnl-1.0.patch | 23 ++++++++++++
 3 files changed, 66 insertions(+), 40 deletions(-)
 delete mode 100644 net-analyzer/bmon/bmon-2.1.0-r2.ebuild
 create mode 100644 net-analyzer/bmon/bmon-2.1.0-r3.ebuild
 create mode 100644 net-analyzer/bmon/files/bmon-2.1.0-libnl-1.0.patch

(limited to 'net-analyzer')

diff --git a/net-analyzer/bmon/bmon-2.1.0-r2.ebuild b/net-analyzer/bmon/bmon-2.1.0-r2.ebuild
deleted file mode 100644
index 59b5b2d6583b..000000000000
--- a/net-analyzer/bmon/bmon-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,40 +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-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"
-IUSE="dbi rrdtool"
-
-DEPEND=">=sys-libs/ncurses-5.3-r2
-	>=dev-libs/libnl-0.5.0
-	dbi? ( >=dev-db/libdbi-0.7.2-r1 )
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.6-r1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# gcc4 fix, bug 105343
-	epatch "${FILESDIR}"/${P}-gcc4.diff
-	# Don't strip, bug #144370
-	epatch "${FILESDIR}"/${P}-nostrip.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable dbi) \
-		$(use_enable rrdtool rrd) || die "econf failed"
-	emake CPPFLAGS="${CXXFLAGS} -I${WORKDIR}/libnl-${NLVER}/include" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog
-}
diff --git a/net-analyzer/bmon/bmon-2.1.0-r3.ebuild b/net-analyzer/bmon/bmon-2.1.0-r3.ebuild
new file mode 100644
index 000000000000..b09470c9e752
--- /dev/null
+++ b/net-analyzer/bmon/bmon-2.1.0-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 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-r3.ebuild,v 1.8 2008/08/14 15:06:06 armin76 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 ~sparc x86"
+IUSE="dbi rrdtool"
+
+DEPEND=">=sys-libs/ncurses-5.3-r2
+	>=dev-libs/libnl-0.5.0
+	dbi? ( >=dev-db/libdbi-0.7.2-r1 )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.6-r1 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# gcc4 fix, bug 105343
+	epatch "${FILESDIR}"/${P}-gcc4.diff
+	# Don't strip, bug #144370
+	epatch "${FILESDIR}"/${P}-nostrip.patch
+	# libnl crap, bug 176378
+	epatch "${FILESDIR}"/${P}-libnl-1.0.patch
+
+}
+
+src_compile() {
+	econf \
+		$(use_enable dbi) \
+		$(use_enable rrdtool rrd) || die "econf failed"
+	emake CPPFLAGS="${CXXFLAGS} -I${WORKDIR}/libnl-${NLVER}/include" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog
+}
diff --git a/net-analyzer/bmon/files/bmon-2.1.0-libnl-1.0.patch b/net-analyzer/bmon/files/bmon-2.1.0-libnl-1.0.patch
new file mode 100644
index 000000000000..32b3e21cce99
--- /dev/null
+++ b/net-analyzer/bmon/files/bmon-2.1.0-libnl-1.0.patch
@@ -0,0 +1,23 @@
+--- configure~	2007-09-03 23:46:20.000000000 +0200
++++ configure	2007-09-03 23:46:20.000000000 +0200
+@@ -7327,13 +7327,13 @@ echo "$as_me:$LINENO: result: $ac_cv_lib
+ echo "${ECHO_T}$ac_cv_lib_nl_nl_connect" >&6
+ if test $ac_cv_lib_nl_nl_connect = yes; then
+ 
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_NL "1"
+-_ACEOF
+-
+-	LIBNL="-lnl"
+-	NL="Yes"
++	case ${target_os} in
++	    *linux*)
++		echo
++		echo "*** Warning: Building bmon on Linuxx w/o libnl ***"
++		echo
++	    ;;
++	esac
+ 
+ else
+ 
-- 
cgit v1.2.3-65-gdbad