Fix libnl dependency (bug #342461).

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 25 insertions, 15 deletions

diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index e9030e48c774..8f37c812109a 100644
--- a/net-analyzer/bmon/ChangeLog
+++ b/net-analyzer/bmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/bmon
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.44 2010/01/30 22:18:23 swegener Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.45 2011/10/27 17:22:43 jer Exp $
+
+  27 Oct 2011; Jeroen Roovers <jer@gentoo.org> bmon-2.1.0-r3.ebuild,
+  bmon-2.1.1_pre1.ebuild:
+  Fix libnl dependency (bug #342461).
 
   30 Jan 2010; Sven Wegener <swegener@gentoo.org> bmon-2.1.0-r3.ebuild,
   +files/bmon-2.1.0-sysfs-symlink.patch, bmon-2.1.1_pre1.ebuild:
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index 7ee3ddaeb68f..6fa8173dd51c 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -7,14 +7,14 @@ AUX bmon-2.1.0-nostrip.patch 443 RMD160 0fbdbfaa613b41e817038aa51b1b26b13d5f58a3
 AUX bmon-2.1.0-sysfs-symlink.patch 382 RMD160 32a596a3492d8d3a4dd4e81f54d87b9ad6162619 SHA1 3d2cecc1363cab1e8bbfcdb7c10d804fdc589d93 SHA256 4877f4b2d0b7d847fde3efeb28b8c477673d8bf8484df44e7bc8ea0221a43646
 DIST bmon-2.1.0.tar.gz 270287 RMD160 7e0a5e0a82bfd3dc30fec899088f2206a75796a0 SHA1 969084269f155583063832751fff5a22a6ac77e3 SHA256 36a5772fc0241298b15db3dc4fb2552dcbb43edeffd6fcea4cd8818e97ec99fe
 DIST bmon-2.1.1-pre1.tar.gz 249796 RMD160 52996cdc2ae1ccfc689b65852e0d468f1d1fb4bb SHA1 d075dca44d7623b7d999f4c0160aa32284540703 SHA256 b60027e8a7c5a1db773a055ee6470e15e79265582b263f1f03bafd65edb5b434
-EBUILD bmon-2.1.0-r3.ebuild 1238 RMD160 4b1aca3cb328407852bfbe987104ac83980bbdbe SHA1 7eee22a84ce05d4776fe6bf307742b816811a78b SHA256 51db39e23bbedbc90eafae1bf36bf4b3e4fb3d14825417477ce20e9418d336e4
-EBUILD bmon-2.1.1_pre1.ebuild 1335 RMD160 3dffbd573e7830224d13d6822835143242ec162c SHA1 3f1385c606f4d5981fc2facfb219f8e2f01a00ef SHA256 df61008232c58a99b575b96589ab7d75465f3f67154756f91c172f2a21f73045
-MISC ChangeLog 5842 RMD160 5066b97af055b2a8b60142ba6584dc3247140a3c SHA1 4c24084487c0dfebfc4547cb42430934ac56eddf SHA256 a3a584186a7bd98293c9f605c05179aaf53d87e0969bb238e301368e25da2182
+EBUILD bmon-2.1.0-r3.ebuild 1259 RMD160 00c12d0e74efff8f1dd4440da008c9ae8305d81c SHA1 02f4d188800de9bb58971e9db916fd210bd2248a SHA256 25d76d398ec1628efc742e306726ecce9c20eb20b2b3b5727bd0dc7890a52e47
+EBUILD bmon-2.1.1_pre1.ebuild 1356 RMD160 20fbf33284f03422d8b553f54ab09a1bd4fcf5c8 SHA1 da67daa6cd48eb96bf26b10ab8db553ba9d3ab6a SHA256 8f7bf64e46593a052c1b948634d981384064abae1eaa3d2999a7e475ac610fb4
+MISC ChangeLog 5971 RMD160 f2dd12297e7a21c6c03bba80635bde95d94c481e SHA1 b6ac6d67eebd1de69f0f9b8239d4c6663ac337e2 SHA256 2b846849422eb592cf1eb63a0ff8a856433f82009dbf5ccb5fbf40303fba9c1f
 MISC metadata.xml 322 RMD160 acef75fc6365dacab6f2d0e8b1aaf58b3bf81d4a SHA1 dc72f277c4d8d9be608f5291474ea86e8165e57e SHA256 b7fb7c6cfe1300d41f8357724e78e656c76a231e1ad41238ce1449dda76c3975
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAktksDQACgkQI1lqEGTUzyTGKwCfSSh5jKfDWblgZKBlD1DK8aet
-zB4An32OgB3udVEopNk91n8sa+e7Y/Iq
-=+2Mh
+iEYEARECAAYFAk6pk2kACgkQVWmRsqeSphPKGACfW2di/xnpup4JaXTS+HmOU0du
+lkIAniXgVR5vv55+7Q4tWgGUvqqtKN5P
+=EtLP
 -----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
index 457c68b376fc..c80eda70404b 100644
--- a/net-analyzer/bmon/bmon-2.1.0-r3.ebuild
+++ b/net-analyzer/bmon/bmon-2.1.0-r3.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/net-analyzer/bmon/bmon-2.1.0-r3.ebuild,v 1.10 2010/01/30 22:18:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0-r3.ebuild,v 1.11 2011/10/27 17:22:43 jer Exp $
+
+EAPI="1"
 
 inherit eutils toolchain-funcs
 
@@ -14,9 +16,10 @@ KEYWORDS="amd64 hppa ~ppc ~sparc x86"
 IUSE="dbi rrdtool"
 
 DEPEND=">=sys-libs/ncurses-5.3-r2
-	>=dev-libs/libnl-0.5.0
+	dev-libs/libnl:1.1
 	dbi? ( >=dev-db/libdbi-0.7.2-r1 )
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.6-r1 )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild b/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
index fb595cd4e584..8650f3391c72 100644
--- a/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
+++ b/net-analyzer/bmon/bmon-2.1.1_pre1.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/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild,v 1.3 2010/01/30 22:18:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild,v 1.4 2011/10/27 17:22:43 jer Exp $
+
+EAPI="1"
 
 inherit eutils toolchain-funcs
 
@@ -17,9 +19,10 @@ KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="dbi rrdtool"
 
 DEPEND=">=sys-libs/ncurses-5.3-r2
-	>=dev-libs/libnl-0.5.0
+	dev-libs/libnl:1.1
 	dbi? ( >=dev-db/libdbi-0.7.2-r1 )
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.6-r1 )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}