Fix for bug #176378

Package-Manager: portage-2.1.3.7

5 files changed, 95 insertions, 9 deletions

diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index 4f8c86f71500..66327662c4f6 100644
--- a/net-analyzer/bmon/ChangeLog
+++ b/net-analyzer/bmon/ChangeLog
@@ -1,6 +1,12 @@
 # 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.32 2007/02/01 21:29:46 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.33 2007/09/05 20:20:50 jokey Exp $
+
+*bmon-2.1.0-r3 (05 Sep 2007)
+
+  05 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/bmon-2.1.0-libnl-1.0.patch, +bmon-2.1.0-r3.ebuild:
+  Fix for bug #176378
 
   01 Feb 2007; Markus Ullmann <jokey@gentoo.org>
   +files/bmon-2.1.0-nostrip.patch, -files/bmon-nostrip.patch,
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index cf73b1e9c50c..7d3df2070325 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -5,6 +5,10 @@ AUX bmon-2.1.0-gcc4.diff 732 RMD160 736a050b4fe592cfabcc6c7c9359092bf6799d3b SHA
 MD5 6b5f014b7739049db269b0d04eddcb63 files/bmon-2.1.0-gcc4.diff 732
 RMD160 736a050b4fe592cfabcc6c7c9359092bf6799d3b files/bmon-2.1.0-gcc4.diff 732
 SHA256 9b4c1e57ffbbc3cd2e8c80d985960c59eb00c1c894f1df9caf12b99f4c893ade files/bmon-2.1.0-gcc4.diff 732
+AUX bmon-2.1.0-libnl-1.0.patch 487 RMD160 4d858d51b9cf1c2f1e7327b2f21fe5c574f33aa6 SHA1 7c3db633a7973871a13c7b9900b0286438757841 SHA256 7cf64ee9dac346ec81d111056d658b66292ef5a1ed5d66aba2e91ede7d4a5c1d
+MD5 730f91e499dd078c2894b8a541eae823 files/bmon-2.1.0-libnl-1.0.patch 487
+RMD160 4d858d51b9cf1c2f1e7327b2f21fe5c574f33aa6 files/bmon-2.1.0-libnl-1.0.patch 487
+SHA256 7cf64ee9dac346ec81d111056d658b66292ef5a1ed5d66aba2e91ede7d4a5c1d files/bmon-2.1.0-libnl-1.0.patch 487
 AUX bmon-2.1.0-nostrip.patch 443 RMD160 0fbdbfaa613b41e817038aa51b1b26b13d5f58a3 SHA1 62382dc8a90c6ba4f797bda542c30a35bbf65d95 SHA256 32b10476f33109cc112c00be5e4396ed010e4a923c9c1537e94d5f7ed303e82a
 MD5 77f74a41aa9edefbb2a8f8a2310902ee files/bmon-2.1.0-nostrip.patch 443
 RMD160 0fbdbfaa613b41e817038aa51b1b26b13d5f58a3 files/bmon-2.1.0-nostrip.patch 443
@@ -14,10 +18,14 @@ EBUILD bmon-2.1.0-r2.ebuild 1074 RMD160 6b3626c3f16fe88d4eb807b26f233ce051d5f9d4
 MD5 72f659c47aa041a005ec01bcecce4a23 bmon-2.1.0-r2.ebuild 1074
 RMD160 6b3626c3f16fe88d4eb807b26f233ce051d5f9d4 bmon-2.1.0-r2.ebuild 1074
 SHA256 85c6fcdb1157448c2b23c254c383a995e67fd95d94bd187d222a8f8b37902099 bmon-2.1.0-r2.ebuild 1074
-MISC ChangeLog 4340 RMD160 aeb82de6e6e70743125dc20ee9efa5e1b5d1aaf3 SHA1 56a308e11111c2b6cdb4c5063053a59e7e3fe117 SHA256 ff0f804e60cea2d1e2761d12c46785bf6ee78c4a7c59a3a9e52664463d38b593
-MD5 40613163ccf5b68e2fb1e946dbf1a454 ChangeLog 4340
-RMD160 aeb82de6e6e70743125dc20ee9efa5e1b5d1aaf3 ChangeLog 4340
-SHA256 ff0f804e60cea2d1e2761d12c46785bf6ee78c4a7c59a3a9e52664463d38b593 ChangeLog 4340
+EBUILD bmon-2.1.0-r3.ebuild 1148 RMD160 503736f4374520aef529a7bba32042660d80cba2 SHA1 e7f85a8963ebf123279ee5fcd9830c16ce64d14e SHA256 987f6d4ebc4dafd876b1e15f8b0d6e8cdad06029d25fc38122cf0b61f4685a08
+MD5 5b5a87cd6f8e2c9a0ca86c65a7b691da bmon-2.1.0-r3.ebuild 1148
+RMD160 503736f4374520aef529a7bba32042660d80cba2 bmon-2.1.0-r3.ebuild 1148
+SHA256 987f6d4ebc4dafd876b1e15f8b0d6e8cdad06029d25fc38122cf0b61f4685a08 bmon-2.1.0-r3.ebuild 1148
+MISC ChangeLog 4502 RMD160 ab6740ba1e783bf7e72dd51d15796010130424d0 SHA1 e4ec54627fb0348fee722f5e23e3c196fb70d2e4 SHA256 59a27fff4ee6d8e22ff377e5c07a0d21a5022e191770b9761168c78dab55d127
+MD5 d7a4447d49cbd6726c5619fdb1af7899 ChangeLog 4502
+RMD160 ab6740ba1e783bf7e72dd51d15796010130424d0 ChangeLog 4502
+SHA256 59a27fff4ee6d8e22ff377e5c07a0d21a5022e191770b9761168c78dab55d127 ChangeLog 4502
 MISC metadata.xml 233 RMD160 4ebadbc3b5e818b45feb3bfdccc5613503e0679f SHA1 4c351bbca92efa8abb682eafe358ef72f6427fde SHA256 d76ab458c17254d148b12fb21c5d4399afa9108768b00022942a8b646fe0b598
 MD5 5fbd67ef2e49ca1d630675f7c46fae5c metadata.xml 233
 RMD160 4ebadbc3b5e818b45feb3bfdccc5613503e0679f metadata.xml 233
@@ -25,10 +33,13 @@ SHA256 d76ab458c17254d148b12fb21c5d4399afa9108768b00022942a8b646fe0b598 metadata
 MD5 41c99e69f43c0c98d0460aac85fc7989 files/digest-bmon-2.1.0-r2 232
 RMD160 00c92c2db673b20ec5a772ad480c8693f99ee7f5 files/digest-bmon-2.1.0-r2 232
 SHA256 bf6f7b61bfd50ba5d4d87d4a758d078cd636f8d2170f80b2dd5df2deb6e6cc73 files/digest-bmon-2.1.0-r2 232
+MD5 41c99e69f43c0c98d0460aac85fc7989 files/digest-bmon-2.1.0-r3 232
+RMD160 00c92c2db673b20ec5a772ad480c8693f99ee7f5 files/digest-bmon-2.1.0-r3 232
+SHA256 bf6f7b61bfd50ba5d4d87d4a758d078cd636f8d2170f80b2dd5df2deb6e6cc73 files/digest-bmon-2.1.0-r3 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFFwlu1z974XjDVpbkRAuPTAJ4s6m+sMKQuVRO3nAQbpTUnbKFmpQCffbdL
-I4OrUqubSB6lTBWylTFBcqE=
-=slUc
+iD8DBQFG3w+sz974XjDVpbkRAmmyAKCgMxOVuddQPJY2RCKMfZShpxERogCbB9Sq
+tMq45B0/FXBX3vvjMXQriWQ=
+=XlF6
 -----END PGP SIGNATURE-----
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..d55926e3c4f9
--- /dev/null
+++ b/net-analyzer/bmon/bmon-2.1.0-r3.ebuild
@@ -0,0 +1,43 @@
+# 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-r3.ebuild,v 1.1 2007/09/05 20:20:50 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
+	# 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
+ 
diff --git a/net-analyzer/bmon/files/digest-bmon-2.1.0-r3 b/net-analyzer/bmon/files/digest-bmon-2.1.0-r3
new file mode 100644
index 000000000000..f5cb3bca416b
--- /dev/null
+++ b/net-analyzer/bmon/files/digest-bmon-2.1.0-r3
@@ -0,0 +1,3 @@
+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