summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDawid Węgliński <cla@gentoo.org>2009-03-08 10:31:35 +0000
committerDawid Węgliński <cla@gentoo.org>2009-03-08 10:31:35 +0000
commitbcedeebe8f7883d841c03af188930a5f2294763f (patch)
tree4e52083871a2a5053c1cf89d7c42995ad0827181 /net-analyzer/ntop
parentMake emake call in src_compile (diff)
downloadgentoo-2-bcedeebe8f7883d841c03af188930a5f2294763f.tar.gz
gentoo-2-bcedeebe8f7883d841c03af188930a5f2294763f.tar.bz2
gentoo-2-bcedeebe8f7883d841c03af188930a5f2294763f.zip
Migrate to EAPI 2
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/ntop')
-rw-r--r--net-analyzer/ntop/ChangeLog5
-rw-r--r--net-analyzer/ntop/ntop-3.2-r3.ebuild20
2 files changed, 10 insertions, 15 deletions
diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index 49cddb905838..3a2750cf88cb 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/ntop
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.68 2009/02/18 21:44:38 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.69 2009/03/08 10:31:35 cla Exp $
+
+ 08 Mar 2009; Dawid Węgliński <cla@gentoo.org> ntop-3.2-r3.ebuild:
+ Migrate to EAPI 2
*ntop-3.3.9-r1 (18 Feb 2009)
diff --git a/net-analyzer/ntop/ntop-3.2-r3.ebuild b/net-analyzer/ntop/ntop-3.2-r3.ebuild
index 77cd6f18ec28..957e46c2a929 100644
--- a/net-analyzer/ntop/ntop-3.2-r3.ebuild
+++ b/net-analyzer/ntop/ntop-3.2-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.2-r3.ebuild,v 1.12 2008/07/04 23:44:20 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.2-r3.ebuild,v 1.13 2009/03/08 10:31:35 cla Exp $
+
+EAPI="2"
inherit eutils autotools
@@ -18,7 +20,7 @@ COMMON_DEPEND="sys-apps/gawk
net-libs/libpcap
>=media-libs/gd-2.0.22
>=media-libs/libpng-1.2.5
- snmp? ( net-analyzer/net-snmp )
+ snmp? ( net-analyzer/net-snmp[ipv6] )
ssl? ( >=dev-libs/openssl-0.9.6 )
tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 )
zlib? ( sys-libs/zlib )"
@@ -41,15 +43,6 @@ pkg_setup() {
eerror "snmp plugin has compilation problems without ipv6 support."
eerror "For additional information see bug #121497."
die "snmp without ipv6 is broken"
- else
- if ! built_with_use net-analyzer/net-snmp ipv6 ; then
- echo
- eerror "You have both ipv6 and snmp enabled."
- eerror "This require ipv6 support in net-analyzer/net-snmp."
- eerror "However, net-analyzer/net-snmp was compiled with ipv6 flag disabled."
- eerror "Please, re-emerge net-analyzer/net-snmp with USE=\"ipv6\"."
- die "net-analyzer/net-snmp was build without ipv6."
- fi
fi
fi
enewgroup ntop
@@ -68,7 +61,7 @@ src_unpack() {
-e "s@/usr/local/bin/dot@/usr/bin/dot@" report.c || die "sed failed"
}
-src_compile() {
+src_configure() {
# force disable xmldumpPlugin
export \
ac_cv_header_glib_h=no \
@@ -86,7 +79,6 @@ src_compile() {
$(use_with tcpd) \
$(use_with zlib) \
|| die "configure problem"
- emake || die "compile problem"
}
src_install() {