diff options
| -rw-r--r-- | net-analyzer/bmon/ChangeLog | 8 | ||||
| -rw-r--r-- | net-analyzer/bmon/Manifest | 5 | ||||
| -rw-r--r-- | net-analyzer/bmon/bmon-2.1.0-r1.ebuild | 21 | ||||
| -rw-r--r-- | net-analyzer/bmon/files/digest-bmon-2.1.0-r1 | 1 | ||||
| -rw-r--r-- | net-analyzer/bmon/files/libnl-0.5.0-include.diff | 10 |
5 files changed, 14 insertions, 31 deletions
diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog index 4ca6fbac955f..76b0db9ac0da 100644 --- a/net-analyzer/bmon/ChangeLog +++ b/net-analyzer/bmon/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/bmon # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.21 2005/09/10 02:08:06 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.22 2005/09/10 20:03:11 vanquirius Exp $ + + 10 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> + -files/libnl-0.5.0-include.diff, bmon-2.1.0-r1.ebuild: + Broke off libnl from bmon, it is now provided by dev-libs/libnl. Dropped all + keywords except x86 because of this, opening a new bug to get things + keyworded properly again. 10 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> bmon-2.1.0-r1.ebuild: Add dbi USE flag, which DEPENDs on dev-db/libdbi and activates support for diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest index 6313319edb28..2efdbc438c51 100644 --- a/net-analyzer/bmon/Manifest +++ b/net-analyzer/bmon/Manifest @@ -1,8 +1,7 @@ -MD5 91c0ad09039f44a5f373db39ca251e13 bmon-2.1.0-r1.ebuild 1324 +MD5 3b97266d135f8b0e8973bf656fec4e4f bmon-2.1.0-r1.ebuild 976 MD5 ff6ae62ffc745b5597d36133b06b6a46 bmon-2.1.0.ebuild 1071 MD5 7df7a0e56272d4182bebc3f365518f50 ChangeLog 2831 MD5 5fbd67ef2e49ca1d630675f7c46fae5c metadata.xml 233 MD5 6b5f014b7739049db269b0d04eddcb63 files/bmon-2.1.0-gcc4.diff 732 -MD5 0eecf3acdb3d426c16ddfd7a398ed1a7 files/libnl-0.5.0-include.diff 364 -MD5 66dfb9b26097d1b2c2e2fe8c9a5ea4c2 files/digest-bmon-2.1.0-r1 125 +MD5 d039d24abde362c72d7e7e5232fa5ec4 files/digest-bmon-2.1.0-r1 62 MD5 66dfb9b26097d1b2c2e2fe8c9a5ea4c2 files/digest-bmon-2.1.0 125 diff --git a/net-analyzer/bmon/bmon-2.1.0-r1.ebuild b/net-analyzer/bmon/bmon-2.1.0-r1.ebuild index 85fc61c1f9a7..a4b3be8a85a7 100644 --- a/net-analyzer/bmon/bmon-2.1.0-r1.ebuild +++ b/net-analyzer/bmon/bmon-2.1.0-r1.ebuild @@ -1,27 +1,24 @@ # Copyright 1999-2005 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-r1.ebuild,v 1.3 2005/09/10 02:08:06 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0-r1.ebuild,v 1.4 2005/09/10 20:03:11 vanquirius Exp $ -inherit toolchain-funcs eutils +inherit eutils 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" - +SRC_URI="http://people.suug.ch/~tgr/bmon/files/${P}.tar.gz" LICENSE="Artistic" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~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} - epatch ${FILESDIR}/libnl-${NLVER}-include.diff # gcc4 fix, bug 105343 epatch ${FILESDIR}/${P}-gcc4.diff sed -i -e "s:LIBNL=\":LIBNL=\"-L${WORKDIR}/libnl-${NLVER}/lib :" \ @@ -30,11 +27,6 @@ src_unpack() { } src_compile() { - cd ${WORKDIR}/libnl-${NLVER} - econf || die - emake || die - - cd ${S} econf \ $(use_enable dbi) \ $(use_enable rrdtool rrd) || die @@ -45,7 +37,4 @@ src_compile() { 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/digest-bmon-2.1.0-r1 b/net-analyzer/bmon/files/digest-bmon-2.1.0-r1 index 8c34508b17da..9aebd63905a3 100644 --- a/net-analyzer/bmon/files/digest-bmon-2.1.0-r1 +++ b/net-analyzer/bmon/files/digest-bmon-2.1.0-r1 @@ -1,2 +1 @@ MD5 3111a027907016c0902d67350c619df6 bmon-2.1.0.tar.gz 270287 -MD5 c58ec5032f393f569ef7f489436651b3 libnl-0.5.0.tar.gz 163375 diff --git a/net-analyzer/bmon/files/libnl-0.5.0-include.diff b/net-analyzer/bmon/files/libnl-0.5.0-include.diff deleted file mode 100644 index f858953c8aef..000000000000 --- a/net-analyzer/bmon/files/libnl-0.5.0-include.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- libnl-0.5.0.orig/include/netlink/route/tc.h 2005-09-08 19:13:15.000000000 -0300 -+++ libnl-0.5.0/include/netlink/route/tc.h 2005-09-08 19:32:33.000000000 -0300 -@@ -24,6 +24,7 @@ - #include <netlink/netlink.h> - #include <netlink/cache.h> - #include <netlink/data.h> -+#include <linux/pkt_sched.h> - - #define TCA_HAS_HANDLE 0x001 - #define TCA_HAS_PARENT 0x002 |