Fixed -lm problem with ulibc (bug #186424; thank Natanael Copa <natanael.copa AT gmail.com> for report. Commited fix for bug #184529 and enabled warnings treated as errors for gtk-2.0 build like upstream wants us. Fix for libgcrypt problem reported by armin76 and fixed by drac.

Package-Manager: portage-2.1.3_rc8

8 files changed, 312 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 288348f61df6..dcdce52c8308 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.64 2007/07/20 18:31:53 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.65 2007/07/24 18:19:03 pva Exp $
+
+*wireshark-0.99.6-r1 (24 Jul 2007)
+
+  24 Jul 2007; <pva@gentoo.org> +files/wireshark-0.99.6-asneeded-r1.patch,
+  +files/wireshark-0.99.6-gint64-warnings.patch,
+  +files/wireshark-0.99.6-libgcrypt.patch, +files/wireshark-0.99.6-lm.patch,
+  +wireshark-0.99.6-r1.ebuild:
+  Fixed -lm problem with ulibc (bug #186424; thank Natanael Copa
+  <natanael.copa AT gmail.com> for report. Commited fix for bug #184529 and
+  enabled warnings treated as errors for gtk-2.0 build like upstream wants us.
+  Fix for libgcrypt problem reported by armin76 and fixed by drac.
 
   20 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   wireshark-0.99.6.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a3d251b44bd5..dfa2ec653db4 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,10 +2,26 @@ AUX wireshark-0.99.5-sizet.patch 290 RMD160 f162ca06aab5b3f62269c3690bef965c1ece
 MD5 9cf68b2290e19ac343fdc91bbff3620f files/wireshark-0.99.5-sizet.patch 290
 RMD160 f162ca06aab5b3f62269c3690bef965c1eceef95 files/wireshark-0.99.5-sizet.patch 290
 SHA256 9081276cb7e8ba74e4f9289e89f3e0bced9e1163b4e7e5cefb3cf7b131605375 files/wireshark-0.99.5-sizet.patch 290
+AUX wireshark-0.99.6-asneeded-r1.patch 1775 RMD160 cf44de4590086c71a79ca7c9757348a12dd230b4 SHA1 098b81e701b04aabf7c0e0f251240b7af803beba SHA256 95fe962a86219ed28d9ae2da56d7174ac4d2b4c142063fe2d78752fb2cf9e066
+MD5 d2da53a8aee7e567da7be57b2f019c14 files/wireshark-0.99.6-asneeded-r1.patch 1775
+RMD160 cf44de4590086c71a79ca7c9757348a12dd230b4 files/wireshark-0.99.6-asneeded-r1.patch 1775
+SHA256 95fe962a86219ed28d9ae2da56d7174ac4d2b4c142063fe2d78752fb2cf9e066 files/wireshark-0.99.6-asneeded-r1.patch 1775
 AUX wireshark-0.99.6-asneeded.patch 1913 RMD160 c461f0d5768de3387976790b7c9d749cc2780b95 SHA1 9a8e3538e421633534000c956351204fc7ce0d84 SHA256 b9819090848f02265d286fdc7b076b39b137cdb29024786fa9cf1b7098db89fd
 MD5 07eefc558b4a3e7bf40806a89e913a30 files/wireshark-0.99.6-asneeded.patch 1913
 RMD160 c461f0d5768de3387976790b7c9d749cc2780b95 files/wireshark-0.99.6-asneeded.patch 1913
 SHA256 b9819090848f02265d286fdc7b076b39b137cdb29024786fa9cf1b7098db89fd files/wireshark-0.99.6-asneeded.patch 1913
+AUX wireshark-0.99.6-gint64-warnings.patch 1840 RMD160 651ea3c62acb82cfe2efa6f841fe3f48d82558d1 SHA1 a75ffdfdfbbf1cc4c4f55794d5d692ff5cdd95ce SHA256 d5860378f4d7ba4fa7dcd41e5a987dbdc63c01c73dd2f5846c26159695a9a58e
+MD5 82d807b394d2ff1cb26728330a72fd23 files/wireshark-0.99.6-gint64-warnings.patch 1840
+RMD160 651ea3c62acb82cfe2efa6f841fe3f48d82558d1 files/wireshark-0.99.6-gint64-warnings.patch 1840
+SHA256 d5860378f4d7ba4fa7dcd41e5a987dbdc63c01c73dd2f5846c26159695a9a58e files/wireshark-0.99.6-gint64-warnings.patch 1840
+AUX wireshark-0.99.6-libgcrypt.patch 1453 RMD160 aa5bc6bffacc80af4a9a513e245f0c9d80440fc8 SHA1 ea871de5a3e487c2cf9f80f801e78e0bb68082c0 SHA256 339c61d2e70932dda19a8e77829fb1a82d1e44e843be6fef49d1e10489c34c83
+MD5 71da340790d1ffd8446e0961375d6b75 files/wireshark-0.99.6-libgcrypt.patch 1453
+RMD160 aa5bc6bffacc80af4a9a513e245f0c9d80440fc8 files/wireshark-0.99.6-libgcrypt.patch 1453
+SHA256 339c61d2e70932dda19a8e77829fb1a82d1e44e843be6fef49d1e10489c34c83 files/wireshark-0.99.6-libgcrypt.patch 1453
+AUX wireshark-0.99.6-lm.patch 1010 RMD160 80caa547e0ea4f8a84f42d349961d0684a47a692 SHA1 16757bdee861dafd801ddd83a8224f3215f2d1cb SHA256 0dfe8eb230a6cc09794de6252f3ada80fc1f740d54849882e491c52be563b8dd
+MD5 dd59d3fe8563f26a2f41eece4df07494 files/wireshark-0.99.6-lm.patch 1010
+RMD160 80caa547e0ea4f8a84f42d349961d0684a47a692 files/wireshark-0.99.6-lm.patch 1010
+SHA256 0dfe8eb230a6cc09794de6252f3ada80fc1f740d54849882e491c52be563b8dd files/wireshark-0.99.6-lm.patch 1010
 AUX wireshark-epan_dissectors_packet-diameter.diff 1106 RMD160 600471845a90d24f6bb65b46c9d2f8e9c851a78d SHA1 c37922ea7e2d12115aaa55ffe361f4724cbfd9f0 SHA256 cf8a00c20abf51456d90b4ff0b6cd19bd64e2796a7268c355a1c482e434c3505
 MD5 6cfe46e4398d7657b708cf8014f93e72 files/wireshark-epan_dissectors_packet-diameter.diff 1106
 RMD160 600471845a90d24f6bb65b46c9d2f8e9c851a78d files/wireshark-epan_dissectors_packet-diameter.diff 1106
@@ -20,14 +36,18 @@ EBUILD wireshark-0.99.5.ebuild 4454 RMD160 ced1aed25d5ee385f27e750195078b5b643fe
 MD5 85cf7bd6d7d47ca660e41d71703eb2f3 wireshark-0.99.5.ebuild 4454
 RMD160 ced1aed25d5ee385f27e750195078b5b643fefd8 wireshark-0.99.5.ebuild 4454
 SHA256 a2a678dcc39cb3f0cc0556ec18c90e71151dcdde7a47082ebcd0c8209fd56994 wireshark-0.99.5.ebuild 4454
+EBUILD wireshark-0.99.6-r1.ebuild 4727 RMD160 5f49dc1fcb70d6994094b32b06b6adc01644e31b SHA1 6090bd20cb477b38e121ab445aa056cc2a7a0ce3 SHA256 c3b75ecb035eaed0062c48f5e646b0630c8edd3021a3bbc6cfb2e3d9bdb82500
+MD5 de7d9acc54c34a4effe047726d3f3d4e wireshark-0.99.6-r1.ebuild 4727
+RMD160 5f49dc1fcb70d6994094b32b06b6adc01644e31b wireshark-0.99.6-r1.ebuild 4727
+SHA256 c3b75ecb035eaed0062c48f5e646b0630c8edd3021a3bbc6cfb2e3d9bdb82500 wireshark-0.99.6-r1.ebuild 4727
 EBUILD wireshark-0.99.6.ebuild 4540 RMD160 97f4065f956237a1ef1cbe5db71648c24b72ebc3 SHA1 33e1045fb7878d3c84d680ba0f452a3d2493d97a SHA256 77c5ba2c1f4b7aef0c395264cafeaa27c12efcf3fadd4cfae4b42196e0b4205f
 MD5 083a63ae00174f5e0bd76e5377509699 wireshark-0.99.6.ebuild 4540
 RMD160 97f4065f956237a1ef1cbe5db71648c24b72ebc3 wireshark-0.99.6.ebuild 4540
 SHA256 77c5ba2c1f4b7aef0c395264cafeaa27c12efcf3fadd4cfae4b42196e0b4205f wireshark-0.99.6.ebuild 4540
-MISC ChangeLog 8982 RMD160 e4472a24fb2b9abe11b806fb90055dfeb6f9602d SHA1 bf907e49f71b4860ae745cdd17afb708d7665a0a SHA256 647ad35b8b992d6ef2b39dae24a016fea4494d8d7930c19aaa703f1cc9891b8c
-MD5 56a5bfffd3e26efbcb760b4609df1a3b ChangeLog 8982
-RMD160 e4472a24fb2b9abe11b806fb90055dfeb6f9602d ChangeLog 8982
-SHA256 647ad35b8b992d6ef2b39dae24a016fea4494d8d7930c19aaa703f1cc9891b8c ChangeLog 8982
+MISC ChangeLog 9531 RMD160 90205d2b5811ec0ab8d84111f5c0f7b1dcb22650 SHA1 f48835d72cfe84607e3296e0a8bbf516105e4c0e SHA256 e441aa40223856e64365d361da15543f28d505a767029ea7ad7ce5170e5b94cc
+MD5 9f9e47ab6bd84a3a7325d786d479024f ChangeLog 9531
+RMD160 90205d2b5811ec0ab8d84111f5c0f7b1dcb22650 ChangeLog 9531
+SHA256 e441aa40223856e64365d361da15543f28d505a767029ea7ad7ce5170e5b94cc ChangeLog 9531
 MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
@@ -38,3 +58,6 @@ SHA256 10ade9a82e7e0d50bed6dac4edce4fccc71c249dc01d40586abc7b94e135bd68 files/di
 MD5 0f2ef8290367ddf5a0c84810711dbae3 files/digest-wireshark-0.99.6 259
 RMD160 9531098dc7d8a6d421c0134393f003096beeb983 files/digest-wireshark-0.99.6 259
 SHA256 256e77c1d2b8df2a47d22fb56cf29354fb4cc4603d71a342b23f0958db43c4ac files/digest-wireshark-0.99.6 259
+MD5 0f2ef8290367ddf5a0c84810711dbae3 files/digest-wireshark-0.99.6-r1 259
+RMD160 9531098dc7d8a6d421c0134393f003096beeb983 files/digest-wireshark-0.99.6-r1 259
+SHA256 256e77c1d2b8df2a47d22fb56cf29354fb4cc4603d71a342b23f0958db43c4ac files/digest-wireshark-0.99.6-r1 259
diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.6-r1 b/net-analyzer/wireshark/files/digest-wireshark-0.99.6-r1
new file mode 100644
index 000000000000..1593025f3afe
--- /dev/null
+++ b/net-analyzer/wireshark/files/digest-wireshark-0.99.6-r1
@@ -0,0 +1,3 @@
+MD5 e57a8c8b364c38df3da97e2ee9f0d0bc wireshark-0.99.6.tar.bz2 11826043
+RMD160 7c69e71e54d521d942bcbad9894547d9785f0948 wireshark-0.99.6.tar.bz2 11826043
+SHA256 118c4a5bfef00651fbe248e1d5c4e4f907b5e2982f47ccfecca2f7f48ab9d3b8 wireshark-0.99.6.tar.bz2 11826043
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded-r1.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded-r1.patch
new file mode 100644
index 000000000000..c80010834dd6
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded-r1.patch
@@ -0,0 +1,13 @@
+--- ./epan/Makefile.am.orig	2007-07-17 12:01:21.000000000 +0400
++++ ./epan/Makefile.am	2007-07-17 12:02:27.000000000 +0400
+@@ -108,8 +108,8 @@
+ #
+ # Add the object files for missing routines, if any.
+ #
+-libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
+-libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
++libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ../wiretap/libwiretap.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
++libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ../wiretap/libwiretap.la $(wslua_lib)
+ 
+ #EXTRA_PROGRAMS = reassemble_test
+ #reassemble_test_LDADD = $(GLIB_LIBS)
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-gint64-warnings.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-gint64-warnings.patch
new file mode 100644
index 000000000000..3d2e00e2b4dd
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.6-gint64-warnings.patch
@@ -0,0 +1,64 @@
+diff -Naur wireshark-0.99.6.orig/configure.in wireshark-0.99.6/configure.in
+--- wireshark-0.99.6.orig/configure.in	2007-07-05 23:25:24.000000000 +0400
++++ wireshark-0.99.6/configure.in	2007-07-10 14:45:20.000000000 +0400
+@@ -1215,16 +1215,19 @@
+   ],
+   [
+     AC_MSG_RESULT(no)
+-    AC_WIRESHARK_CHECK_64BIT_FORMAT(ll,
++    AC_WIRESHARK_CHECK_64BIT_FORMAT(l,
+       [
+-	AC_WIRESHARK_CHECK_64BIT_FORMAT(L,
+-	  [
+-	    AC_WIRESHARK_CHECK_64BIT_FORMAT(q,
+-	      [
+-		AC_MSG_ERROR([neither %llx nor %Lx nor %qx worked on a 64-bit integer])
+-	      ])
+-	  ])
+-      ])
++      AC_WIRESHARK_CHECK_64BIT_FORMAT(ll,
++       [
++         AC_WIRESHARK_CHECK_64BIT_FORMAT(L,
++           [
++             AC_WIRESHARK_CHECK_64BIT_FORMAT(q,
++               [
++                 AC_MSG_ERROR([neither %lx nor %llx nor %Lx nor %qx worked on a 64-bit integer])
++               ])
++           ])
++       ])
++    ])
+   ])
+ 
+ GETOPT_C=""
+diff -Naur wireshark-0.99.6.orig/wiretap/configure.in wireshark-0.99.6/wiretap/configure.in
+--- wireshark-0.99.6.orig/wiretap/configure.in	2007-07-05 23:25:16.000000000 +0400
++++ wireshark-0.99.6/wiretap/configure.in	2007-07-10 14:49:20.000000000 +0400
+@@ -288,16 +288,19 @@
+   ],
+   [
+     AC_MSG_RESULT(no)
+-    AC_WIRETAP_CHECK_64BIT_FORMAT(ll,
++    AC_WIRETAP_CHECK_64BIT_FORMAT(l,
+       [
+-	AC_WIRETAP_CHECK_64BIT_FORMAT(L,
+-	  [
+-	    AC_WIRETAP_CHECK_64BIT_FORMAT(q,
+-	      [
+-		AC_MSG_ERROR([neither %llx nor %Lx nor %qx worked on a 64-bit integer])
+-	      ])
+-	  ])
+-      ])
++      AC_WIRETAP_CHECK_64BIT_FORMAT(ll,
++       [
++         AC_WIRETAP_CHECK_64BIT_FORMAT(L,
++           [
++             AC_WIRETAP_CHECK_64BIT_FORMAT(q,
++               [
++                 AC_MSG_ERROR([neither %lx nor %llx nor %Lx nor %qx worked on a 64-bit integer])
++               ])
++           ])
++       ])
++    ])
+   ])
+ 
+ #
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-libgcrypt.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-libgcrypt.patch
new file mode 100644
index 000000000000..139e3885142c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.6-libgcrypt.patch
@@ -0,0 +1,11 @@
+--- ./epan/Makefile.am.orig	2007-07-17 12:03:46.000000000 +0400
++++ ./epan/Makefile.am	2007-07-17 12:04:54.000000000 +0400
+@@ -108,7 +108,7 @@
+ #
+ # Add the object files for missing routines, if any.
+ #
+-libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ../wiretap/libwiretap.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
++libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ../wiretap/libwiretap.la $(wslua_lib) @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
+ libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ../wiretap/libwiretap.la $(wslua_lib)
+ 
+ #EXTRA_PROGRAMS = reassemble_test
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-lm.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-lm.patch
new file mode 100644
index 000000000000..a89d7bf145e5
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.6-lm.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/show_bug.cgi?id=186424
+
+"Forgetting" -lm is a common mistake since glibc works without it. Other libc's
+are not as forgiving.
+
+--- ./wiretap/configure.in.orig	2007-07-24 13:38:56.000000000 +0400
++++ ./wiretap/configure.in	2007-07-24 13:50:08.000000000 +0400
+@@ -324,6 +324,10 @@
+ ])
+ AC_WIRETAP_PCAP_CHECK
+ 
++# C libraries that are not libc (like ulibc) requre -lm. bug #1704
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ dnl zlib check
+ AC_MSG_CHECKING(whether to use zlib for reading compressed capture files)
+ 
+--- ./wiretap/Makefile.am.orig	2007-07-24 13:38:46.000000000 +0400
++++ ./wiretap/Makefile.am	2007-07-24 13:43:10.000000000 +0400
+@@ -69,8 +69,8 @@
+ 	$(GENERATOR_SOURCES) 	\
+ 	$(GENERATED_FILES)
+ 
+-libwiretap_la_LIBADD = libwiretap_generated.la
+-libwiretap_la_DEPENDENCIES = libwiretap_generated.la
++libwiretap_la_LIBADD = libwiretap_generated.la @LIBM@
++libwiretap_la_DEPENDENCIES = libwiretap_generated.la @LIBM@
+ 
+ ascend-grammar.c : ascend-grammar.y
+ 	@if [ -z "$(YACC)" ]; then \
diff --git a/net-analyzer/wireshark/wireshark-0.99.6-r1.ebuild b/net-analyzer/wireshark/wireshark-0.99.6-r1.ebuild
new file mode 100644
index 000000000000..f0feb5867b37
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-0.99.6-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.6-r1.ebuild,v 1.1 2007/07/24 18:19:03 pva Exp $
+
+WANT_AUTOMAKE="1.9"
+inherit autotools libtool flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+SRC_URI="mirror://sourceforge/wireshark/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="adns gtk ipv6 portaudio snmp ssl kerberos threads selinux"
+
+RDEPEND="sys-libs/zlib
+	snmp? ( net-analyzer/net-snmp )
+	gtk? ( >=dev-libs/glib-2.0.4
+		=x11-libs/gtk+-2*
+		x11-libs/pango
+		dev-libs/atk )
+	!gtk? ( =dev-libs/glib-1.2* )
+	ssl? ( dev-libs/openssl )
+	!ssl? (	net-libs/gnutls )
+	net-libs/libpcap
+	dev-libs/libpcre
+	adns? ( net-libs/adns )
+	kerberos? ( virtual/krb5 )
+	portaudio? ( media-libs/portaudio )
+	selinux? ( sec-policy/selinux-wireshark )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.15.0
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	sys-apps/sed"
+
+pkg_setup() {
+	# bug 119208
+	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
+		ewarn "wireshark will not build if dev-lang/perl is compiled with"
+		ewarn "USE=minimal. Rebuild dev-lang/perl with USE=-minimal and try again."
+		ebeep 5
+		die "dev-lang/perl compiled with USE=minimal"
+	fi
+
+	if ! use gtk; then
+		ewarn "USE=-gtk will mean no gui called wireshark will be created and"
+		ewarn "only command line utils are available"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/epan
+	epatch "${FILESDIR}"/wireshark-except-double-free.diff
+	epatch "${FILESDIR}"/wireshark-epan_dissectors_packet-diameter.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gint64-warnings.patch
+	epatch "${FILESDIR}"/${P}-asneeded-r1.patch
+	epatch "${FILESDIR}"/${P}-libgcrypt.patch
+	epatch "${FILESDIR}"/${P}-lm.patch
+	#elibtoolize
+	AT_M4DIR="${S}/aclocal-fallback"
+	eautoreconf
+}
+
+src_compile() {
+	# optimization bug, see bug #165340
+	if [[ "$(gcc-version)" == "3.4" ]] ; then
+		elog "Found gcc 3.4, forcing -O3 into CFLAGS"
+		replace-flags -O? -O3
+	else
+		elog "Forcing -O into CFLAGS"
+		replace-flags -O? -O
+	fi
+
+	# see bug #133092
+	filter-flags -fstack-protector
+
+	local myconf
+
+	if use gtk; then
+		einfo "Building with gtk support"
+	else
+		einfo "Building without gtk support"
+		myconf="${myconf} --disable-wireshark --disable-warnings-as-errors"
+		# the asn1 plugin needs gtk
+		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
+		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
+	fi
+
+	#	$(use_with lua) \
+	econf $(use_with ssl) \
+		$(use_enable ipv6) \
+		$(use_with adns) \
+		$(use_with kerberos krb5) \
+		$(use_with snmp net-snmp) \
+		$(use_with portaudio) \
+		$(use_enable gtk gtk2) \
+		$(use_enable threads) \
+		--without-ucd-snmp \
+		--enable-dftest \
+		--enable-randpkt \
+		--sysconfdir=/etc/wireshark \
+		--enable-editcap \
+		--enable-capinfos \
+		--enable-text2pcap \
+		--enable-dftest \
+		--enable-randpkt \
+		${myconf} || die "econf failed"
+
+	# fixes an access violation caused by libnetsnmp - see bug 79068
+	use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	dodoc AUTHORS ChangeLog NEWS README*
+
+	insinto /usr/share/icons/hicolor/16x16/apps
+	newins "${S}"/image/hi16-app-wireshark.png wireshark.png
+	insinto /usr/share/icons/hicolor/32x32/apps
+	newins "${S}"/image/hi32-app-wireshark.png wireshark.png
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins "${S}"/image/hi48-app-wireshark.png wireshark.png
+	make_desktop_entry wireshark "Wireshark" wireshark
+	dosym tshark /usr/bin/tethereal
+	use gtk && dosym wireshark /usr/bin/ethereal
+}
+
+pkg_postinst() {
+	ewarn "Due to a history of security flaws in this piece of software, it may contain more flaws."
+	ewarn "To protect yourself against malicious damage due to potential flaws in this product we recommend"
+	ewarn "you take the following security precautions when running wireshark in an untrusted environment:"
+	ewarn "do not run any longer than you need to;"
+	ewarn "use in a root jail - prefereably one that has been hardened with grsec like rootjail protections;"
+	ewarn "use a hardened operating system;"
+	ewarn "do not listen to addition interfaces;"
+	ewarn "if possible, run behind a firewall;"
+	ewarn "take a capture with tcpdump and analyze running wireshark as a least privileged user;"
+	ewarn "and subscribe to wireshark's announce list to be notified of newly discovered vulnerabilities."
+}