Fix for bug 121497.

Package-Manager: portage-2.0.54

3 files changed, 26 insertions, 30 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index 03a0aed0f059..77f125ca77c7 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.44 2006/02/01 14:11:05 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.45 2006/02/07 22:01:57 pva Exp $
+
+  07 Feb 2006; Peter Volkov <pva@gentoo.org> ntop-3.2-r1.ebuild:
+  Fix for bug 121497.
 
 *ntop-3.2-r1 (01 Feb 2006)
 
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index fb080bcd477e..5c18923785b7 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,39 +1,13 @@
-MD5 c9acd96af4f34701aec9a0a10d0026db ChangeLog 5818
-RMD160 42a132752d870542f264ec972c650546cfa62d82 ChangeLog 5818
-SHA256 3009ddccf927918db3b788c16acba71f179c04b62c83b6523fece5d5b78d292a ChangeLog 5818
+MD5 7d1b05f2beeadd93704d519c662411f6 ChangeLog 5904
 MD5 35c576fac5bd8cbf0da850ccc00dd924 files/digest-ntop-3.0 58
-RMD160 d8dfb8a8692af63ac71589caf25f2da6ea6b415b files/digest-ntop-3.0 58
-SHA256 6835bc892d7b44490957ae5530cca3254671d722ad82df741452adfb90c49fe5 files/digest-ntop-3.0 58
 MD5 bb970d07a76d2b939ec08c2796519021 files/digest-ntop-3.1 58
-RMD160 7b992bd4ebf332cd41493d281947977788a49300 files/digest-ntop-3.1 58
-SHA256 d0146fac16615144631ae38c443835059eb84848ff8624dadcb9ab399ca6cd8c files/digest-ntop-3.1 58
 MD5 c9b1d854b1ac5779d7f28125bd89d238 files/digest-ntop-3.2-r1 220
-RMD160 d5ca25fd1bd9eec83de29bd893369b8a000fed6d files/digest-ntop-3.2-r1 220
-SHA256 fec72a84051cd908bd49dab5802bd22225c8a697f8ef28bcb8d65c2832396b36 files/digest-ntop-3.2-r1 220
 MD5 d1e896708a98eaca02f55c44ae517768 files/globals-core.c.diff 536
-RMD160 33d049b6c5143f42294bce9a7bf366e69e98d329 files/globals-core.c.diff 536
-SHA256 47077ead74ec2f10d9b65ee26ff3ea6f2c2d30908a151e1417e797a9c780d828 files/globals-core.c.diff 536
 MD5 21f35f61ff1c20d194e7f4c246c2b002 files/ntop-3.2-build.patch 9369
-RMD160 396ab052d11c21f5f33ea246c57aae8f1e4b2e35 files/ntop-3.2-build.patch 9369
-SHA256 9df47e5c250f26c408ca8f35faa0e35166a3e1d2fe3924387bd9acb1907cd23d files/ntop-3.2-build.patch 9369
 MD5 c88f7f9b27aeb11a93cd1cfb78a1def1 files/ntop-3.2-snmp.patch 776
-RMD160 22b4e288b88beaff7a855f18b9b9a1bec09d92da files/ntop-3.2-snmp.patch 776
-SHA256 c2cb51b8adb0909f29580846ee58d07c105998b5675cebf97f1cfda36e20abef files/ntop-3.2-snmp.patch 776
 MD5 43a9167b2aa1fc1db92721d7e4bfeb09 files/ntop-confd 168
-RMD160 a271189f232a95cf436b811521d3746d223733ad files/ntop-confd 168
-SHA256 611946b6e9218171cedf0a91a8e7c1cb897fd2325dafae88a6837a7582bfe88f files/ntop-confd 168
 MD5 9e6b1e20779d7fb6699c956adf6b8b05 files/ntop-init 294
-RMD160 3f64de5bad3c851c491f286f95bab5d906e6f6db files/ntop-init 294
-SHA256 697e5f6dc4d267ef0c703a8185f7402fc9af777be9d2786a41234db760c839fb files/ntop-init 294
 MD5 846e7479e3e9df4363f2721b7fb47320 metadata.xml 233
-RMD160 a40e5be287eb28adcd2008eb2de7a786bfd688c6 metadata.xml 233
-SHA256 1cd97d0616d391c2639822aa603b9ae39e60796da9e21f498a8e856d317e0a0b metadata.xml 233
 MD5 b924509c0c1399888a43c3a5d3ccc55d ntop-3.0.ebuild 1598
-RMD160 8cb7160a5db7d3862cbfaefc2fb83f8e091de347 ntop-3.0.ebuild 1598
-SHA256 a50c8bb34cca849ee9486b5c454486ad8bea1ba7ecd6f640875ae1bc95f16654 ntop-3.0.ebuild 1598
 MD5 4ab5248f4a98565130768d8ba364e49f ntop-3.1.ebuild 2398
-RMD160 2eb0fde5abd06ba79d2c8ccd99cad4a611d3e6cf ntop-3.1.ebuild 2398
-SHA256 9a8d104a5e9700378eee10c223d0fa1e9ced9a936387beab62e3f40dfb433526 ntop-3.1.ebuild 2398
-MD5 1f264535dd56eb4194d938a7703fb42f ntop-3.2-r1.ebuild 2023
-RMD160 8cb9bca8c2d964d70c962ac38dbb8ae7023e1e45 ntop-3.2-r1.ebuild 2023
-SHA256 146f666b57f5e9adffdc220a573d0ece6b74da07ef421f18820b73893de47f46 ntop-3.2-r1.ebuild 2023
+MD5 2bde22a6c989194119170abd9db970c7 ntop-3.2-r1.ebuild 2773
diff --git a/net-analyzer/ntop/ntop-3.2-r1.ebuild b/net-analyzer/ntop/ntop-3.2-r1.ebuild
index 1705c944c06e..2179cd1903c0 100644
--- a/net-analyzer/ntop/ntop-3.2-r1.ebuild
+++ b/net-analyzer/ntop/ntop-3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.2-r1.ebuild,v 1.1 2006/02/01 14:11:05 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.2-r1.ebuild,v 1.2 2006/02/07 22:01:57 pva Exp $
 
 inherit eutils autotools
 
@@ -29,6 +29,25 @@ DEPEND="sys-apps/gawk
 #	>=dev-libs/glib-2"
 
 pkg_setup() {
+	if use snmp ; then
+		ewarn "snmp plugin is under development and upstream does not recommend"
+		ewarn "it for usage in production environment."
+		if ! use ipv6 ; then
+			echo
+			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, reemrege net-analyzer/net-snmp with USE=\"ipv6\"."
+				die "net-analyzer/net-snmp was build without ipv6."
+			fi
+		fi
+	fi
 	enewgroup ntop
 	enewuser ntop -1 -1 /var/lib/ntop ntop
 }