Fix access violation caused by libnetsnmp when USE=snmp, bug 79068.

(Portage version: 2.0.51-r15)

3 files changed, 16 insertions, 20 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 3d27405e5c97..a9d9e13ca5a0 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.103 2005/01/21 23:26:13 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.104 2005/01/25 10:39:17 ka0ttic Exp $
+
+  25 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> ethereal-0.10.9-r1.ebuild:
+  Fix access violation caused by libnetsnmp when USE=snmp, bug 79068.
 
   21 Jan 2005; Markus Rothe <corsair@gentoo.org> ethereal-0.10.9.ebuild:
   Stable on ppc64; bug #78559
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 50e0237df8eb..d0ab0a65c227 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,25 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4777b3dbcd9b1511d928eea9642d0a91 ChangeLog 6202
-MD5 42fac92ae54479b9f7f86b8563a5ce0e ethereal-0.10.5-r1.ebuild 2594
-MD5 ba5377cb40edb3adf6eafa406132dfac ethereal-0.10.6.ebuild 2485
-MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
 MD5 eb7903393ecfa6f95d2c4335d246cf9e ethereal-0.10.8.ebuild 2422
-MD5 bd3db02303e583694ff1bec121a23eb9 ethereal-0.10.9-r1.ebuild 2183
 MD5 01cd2927b597e9b3347eca520cb607d0 ethereal-0.10.5.ebuild 2580
 MD5 a0ec97e0205fcf72ebce6d5abcc9aa56 ethereal-0.10.9.ebuild 2425
+MD5 ba5377cb40edb3adf6eafa406132dfac ethereal-0.10.6.ebuild 2485
+MD5 f13d35999c35e23bdecba3e4c4265550 ethereal-0.10.9-r1.ebuild 2305
+MD5 0f2685292cc772f99eb02f72ed6d8306 ChangeLog 6349
+MD5 42fac92ae54479b9f7f86b8563a5ce0e ethereal-0.10.5-r1.ebuild 2594
+MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+MD5 5a73274ec255373b4e618388cd057275 files/0.10.4-gcc34.patch 458
+MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5-r1 69
+MD5 ead2b5faadcb1443141a8a22e0e2a217 files/digest-ethereal-0.10.9-r1 69
 MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5 69
 MD5 5bc98004e6492e3349a16bf0591c743e files/digest-ethereal-0.10.6 69
 MD5 8f052b2e09156338ef122fbfd4cfa975 files/digest-ethereal-0.10.8 69
-MD5 ead2b5faadcb1443141a8a22e0e2a217 files/digest-ethereal-0.10.9-r1 69
 MD5 ead2b5faadcb1443141a8a22e0e2a217 files/digest-ethereal-0.10.9 69
-MD5 5a73274ec255373b4e618388cd057275 files/0.10.4-gcc34.patch 458
-MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5-r1 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB8Y+bmdTrptrqvGERAiTZAJ9DdL4cJvdk3NYEQwLP/W45H8nySwCcCHyX
-9Sx1/qYhv1BpFE8ItrrlPns=
-=UeLw
------END PGP SIGNATURE-----
diff --git a/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild b/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild
index 65a71d59f2b8..1f15803feb74 100644
--- a/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild,v 1.1 2005/01/21 23:26:13 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild,v 1.2 2005/01/25 10:39:17 ka0ttic Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -70,6 +70,9 @@ src_compile() {
 		--sysconfdir=/etc/ethereal \
 		${myconf} || die "bad ./configure"
 
+	# fixes an access violation caused by libnetsnmp - see bug 79068
+	use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
+
 	emake || die "compile problem"
 }