Migrate to EAPI 2

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 12 insertions, 27 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/Manifest b/net-analyzer/ntop/Manifest
index af926de4e895..411c9eb8b3be 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX globals-core.c.diff 536 RMD160 33d049b6c5143f42294bce9a7bf366e69e98d329 SHA1 7e59696252d26bef817210b016b16aa3b3f19754 SHA256 47077ead74ec2f10d9b65ee26ff3ea6f2c2d30908a151e1417e797a9c780d828
 AUX ntop-3.2-build.patch 9369 RMD160 396ab052d11c21f5f33ea246c57aae8f1e4b2e35 SHA1 1dea08b5ad9652af5d6b9369bab9407a9a23ee39 SHA256 9df47e5c250f26c408ca8f35faa0e35166a3e1d2fe3924387bd9acb1907cd23d
 AUX ntop-3.2-snmp.patch 776 RMD160 22b4e288b88beaff7a855f18b9b9a1bec09d92da SHA1 a197e0887ea05bc223951d65c349382592bc3b4a SHA256 c2cb51b8adb0909f29580846ee58d07c105998b5675cebf97f1cfda36e20abef
@@ -15,16 +12,9 @@ DIST ntop-3.2.tgz 3910593 RMD160 18ea4b535826e6d7bdf56c071c271869653cba8d SHA1 a
 DIST ntop-3.3.6.tar.gz 3635457 RMD160 50f8c7743d36effdfe07037453fa24c8bb42062a SHA1 320ab9ccc0d71dedf0e200e283834eb684163ee3 SHA256 6a190d868805110336afabe078ab9cf0bc2b26e14810a5160fc9689d554df57d
 DIST ntop-3.3.8.tar.gz 5626313 RMD160 cd1b3e08f74d9231d56fc8b619ce5e85d3fabbd0 SHA1 6ef20a1c43ce560b81e6439dc7ad0f7b29edc2c0 SHA256 8e25f3c527493e1495030b1b8cfb09158c75829a740f55c6339674efcc504238
 DIST ntop-3.3.9.tar.gz 4955257 RMD160 3d7b14bff99a6652ae83fb86a2cda3206cc3392c SHA1 77c1976d096709c6e45dcfe4befc2045cf83774b SHA256 606c027d02cdaab7de87475bef8be168e9f18329c2215ac21a518766aa8a331f
-EBUILD ntop-3.2-r3.ebuild 3026 RMD160 1e6be221d06e34363204b46b66ef0e78d67084ea SHA1 7bb27f08e1e1cfa71adadc93eae6b40b4963726c SHA256 8213b04e0f8950fb1f096a3c1c5ff4523020d441b161618fa4a54d3389c3f4d3
+EBUILD ntop-3.2-r3.ebuild 2605 RMD160 06890151b3a2ad1084823f3e6ec42ba80801e229 SHA1 8b606f4e2e561d748316393171ad9da539524866 SHA256 6ae43b7a7e3d6783c4d4dcac5f48f894d0f86728af66838466f03ed6543a58a5
 EBUILD ntop-3.3.6.ebuild 3228 RMD160 91bf24321e591c99c1654c58e39b5db3b69cb6f1 SHA1 e757d1b4b07b5359daca77fc17f04d206097f88c SHA256 0a72f39b32658374f315e8ef5ccd642aed43aee801ee1a36760cfcd7a0263b03
 EBUILD ntop-3.3.8.ebuild 3141 RMD160 03c722452d5af5ac49693430725ea03f00eb2226 SHA1 80b7347d8c1af69699ddd22c91d9055a607b6672 SHA256 31e79951ae18125012ff49f371f8f2e02bbc8dac00269b738fbfbec260fc729a
 EBUILD ntop-3.3.9-r1.ebuild 3468 RMD160 56cdf536309d306373e89749f119559aba78b4b6 SHA1 3fd6c3bbe3317a06dbe28673c5cdf7f2c45c12ad SHA256 2c0a8e228d2b7ac2dfd8426fe969f18379a78ffd2bdbe1ccb58239bd3b71aa47
-MISC ChangeLog 9588 RMD160 7111e929b2807e7eef5cbd5a5c361791d4b48537 SHA1 8c7d7f773fb29999bbabe9a5c560db2c842bc690 SHA256 04375b714cb6d1a54095bb4ce227c44722dfc5a4789c48552698449e066f1b55
+MISC ChangeLog 9676 RMD160 b0edb58237209fdecc6c72e829df6e824019ecc9 SHA1 adedfacbb0bceb7837940e04061cc3e710be0636 SHA256 2e69b225d6a698fa62cce6e122184d9acae3a9e122981fd15dece7df1ca02991
 MISC metadata.xml 322 RMD160 b7f7af3a210902c2b2496ec63b09a3ba372b695b SHA1 b1066ca022ba3396c1964d517c366686339e3c82 SHA256 7ed574b22255d4bbc246459407865f6b9405e7ec7de95c08e16bbf3d2ba2134b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmcgVcACgkQts85UDFmaOXsGwCfaxxntIi54VfGWEhKxjlv/P4M
-bNcAn0GpEK0r51G5fO0nzG2JM1jqkFg/
-=Z1Fd
------END PGP SIGNATURE-----
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() {