Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 310 insertions, 15 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 32ad6486ddbc..bb020f9604e9 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.718 2015/05/16 09:23:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.719 2015/05/31 18:09:03 jer Exp $
+
+*wireshark-1.99.6 (31 May 2015)
+
+  31 May 2015; Jeroen Roovers <jer@gentoo.org> +wireshark-1.99.6.ebuild,
+  +files/wireshark-1.99.6-gcc_option.patch:
+  Version bump.
 
   16 May 2015; Mike Frysinger <vapier@gentoo.org>
   +files/wireshark-1.12.5-cross-compile.patch, wireshark-1.12.5.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 238571304add..9a4aa120fa26 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -9,30 +9,23 @@ AUX wireshark-1.99.0-qt5.patch 2757 SHA256 79621949e1b0d99229e1a033b58f7a2c18cfb
 AUX wireshark-1.99.0.1975-gcc_option.patch 2939 SHA256 4d534da5b4a45f311a622108a0a4313d1581925a8cdf35d8429d5f46baab0963 SHA512 a48204408b05cd61ee9e1beb36dcb4d11b49bdb150c13fbdf490f9bb4a14fee3fc5113c501c03e294a944ae3fb36ad9d37a406eeb09ea87e02f2ce44ab6b6568 WHIRLPOOL 0c7d944840a93931fc95d5deb53e45b3e43e6129d9af51a9ac53c1a0f190b202c02b9abf89b04e863f3d803a52d91c5496cf357cb3e5bd244a49c0fa7c56e8b0
 AUX wireshark-1.99.0.1975-sse4_2.patch 555 SHA256 bef93463a257b6154cf55f85e7860b373264e2a89f212f6db773ad02f3a6bedf SHA512 5086b36ecf9b1dd3292011602c8824a572dc759a0e35049a39f0da8045a93738a8f2c2b4c053a0f1d999dc8cdb7bfec3b33f2780d8795135dd65984355485578 WHIRLPOOL 55301e3ff688fbe7df405d40dd8a6e942d1613ee0e4543f46fa83ac6f0688170753fe1cfc67bbe00b9bd7a46cf73513530cc746ee29ba7845e3a45d12ed07743
 AUX wireshark-1.99.1-sbc.patch 665 SHA256 c76afab0f03c59001df597948153bf76bbdc14da30a2de9e93831bed6dc6e898 SHA512 3e71c9ecfb07c96df8330b6a1fa959bde79bf7531f106b7f90acc59a82f3b1ec74ae1643b9b13cd6a642b25766996afa7083ac1daa2bada765134ae8846112a8 WHIRLPOOL 8b53a06ffa03579ed71a558cb475e05bb7152463123089cec80b3f00ae68bab02fcba2fa789471419175965be6af1604e8371b30b9dd04a5b967c995627a5517
+AUX wireshark-1.99.6-gcc_option.patch 1458 SHA256 7f6e670a2e45ec040f5d2caf900b1a32d48edce1545838a6092e8c46f43bbf86 SHA512 492e655d907e0699976ac27640e79c2869f36ba33dc550953a70a823cab4add049b524b78dcd1ec0f3730e21d88782a4ad0681d40733c946a98df596acecf124 WHIRLPOOL 127fb1318a2aeb0f704265a9a46dcca5cccd51a2cc3b48fb575065d618cae97ce6168114bed9f79e611071c5442f6e2989072a7efef9edd9eeb2f9a42180ac29
 AUX wireshark-99999999-pkgconfig.patch 1563 SHA256 30aff5b0264210c823bf892f9c87de4d8ce28cca09ed2f6b22ebae4f58e7bb17 SHA512 4f22ac8c6e0cd4f37428d028810a56e722cdd78bdd24bab7f4686b0fc6179a2105e6436c12785f8430e4c10e76eeb6db17cf5d4dfe2b1cc40ed2041c777a0bda WHIRLPOOL 3f958c87f8957cc364343f2dc9cb4663d6218bb2752a74d4599441c2fdaed73947beda3185824e80128c49ba2a03de63422987a3df9aa6f69b1c5b07574e9cc4
 DIST wireshark-1.12.4.tar.bz2 29257016 SHA256 de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312 SHA512 ceeb6cb4489ce150a6065e586f83cfbcd0fd79cd05cf8ab5b0346baa03eaa5188503b18a1f228458447235d79f765c410e6b52b9aae77547f80b206429c77b24 WHIRLPOOL 31e3bce9d9003140f808b49e263727bb9386530a81a4ccd6e24cb6bc78f95cc5104da360be7edcd3a214de713b65931b4e77054cb1c3480d8e8c892fce57ed9a
 DIST wireshark-1.12.5.tar.bz2 29208507 SHA256 d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82 SHA512 857f0299290d5ca1a34ec4296bf6ef1da82fb59af1aae2c095599e16c4a95a653987d60611d58874dd8cb3271838b0a4ec476a17c52e781cb56607ac39197136 WHIRLPOOL 00592ebba59532acfe8c4b77efe87370573d1084395a27de0bdc92ce7aa1d8567d9b3a10697fb9469c890d724dfed7f1c720408230b6f39ff0a0c09670df00b1
 DIST wireshark-1.99.5.tar.bz2 29806267 SHA256 d2d5dd1367eb05037651daf7355888f5938d5ca45fcd730fe117605adf9e6c7c SHA512 5c951f189a0904c02897ee81101896215332c39f3ae3daaef92c923f020a6bd46b9158329add8d70e7ffbe06175252b8b477e4ca9bc86ae96b198bda20296235 WHIRLPOOL 2b70ea5df6b9c50bef6df9e05158ad8fd8ac106df1600eb51aa5b42002f05853d76ed446ac6f8b4cfad9e5899e1022f296830f6aadc23c41924ceb8f866c5321
+DIST wireshark-1.99.6.tar.bz2 30046495 SHA256 dfd8800f15a531573700703fee32c97f6c1525615c5d2b92a110fd50b259cc1a SHA512 376d7527c97b44da7460be8089110a0179a1c6b773bb9f82db1dc2f77aaa19d053486abfe0f2819ac8b401a7d1df2d37df5caa53c05e5dbb774ca40f5c41426b WHIRLPOOL a63c03b5c42e50558b1325765fa797f31e19512db5bfd89fbe8edcf40f01ef9bc17b2d48f09bbcbf96f8d506f1c08c1d1d9ec6a4b1d2f0d60434d2c4f703f444
 EBUILD wireshark-1.12.4.ebuild 6244 SHA256 02bc56a450370516854f5724a2f6b0ba0a8f8b07160c8262738c10aae3086dfb SHA512 0fd625acf77240de2115c3dfd853deb6aba2061d000ab89a5deebf432a745a44ab12012087e4b20e560036b600fdccaab9640ef852c52abe5e7b2aed0b88ef5c WHIRLPOOL 99269eae2d3cdb600314bfb6f2503f0cc780eb45742784079368e2af99ac57cd38c7685172964e5d6d2aff24d0811e227c5bc6f486e4a339306d0fb51cebbc0a
 EBUILD wireshark-1.12.5.ebuild 6302 SHA256 8a133c7ab3358abafa520c6878926dfbc1493aec8924d36c904c474f60c8fd16 SHA512 db585578d1d25f2df0a62dda7ffa7d2d229bdc2c6b4bd2ad84481b952a669607aedf2025b0d09485297343c02071e7bbfcf6fcdc4ff5ec0c0ad872c477bc7fec WHIRLPOOL 3bfaf500b269d932d1b7d1b445a194eae73b60e3b37739145f844ccc4e9330b064b76e2ef487a0f4c75e2ea7a78eb5d431a42ed23e946faf82effdf964825593
 EBUILD wireshark-1.99.5.ebuild 6372 SHA256 174f69b104d0d08005baadd9a4b14b1b5fbdfc83f9769daaa570f11d7d4638ec SHA512 94fdb4104c692667e2aa77c5614f1ed35cb44f986de2448bcd7267388ffd36d43b96ae9013f51a966a603add0ab1ea711f6e32300210a11b4dee6f6437073180 WHIRLPOOL 4e167885ebebe43c25608633add36d9d2ad0aa9c12786ddbef9e39ee72d956253861d257995131b4d566a164bf56b8fb103e4fe1f4db9f5943153963eff5ee9f
+EBUILD wireshark-1.99.6.ebuild 6444 SHA256 4c074a0f883b19bbf7f31ef06d2d6ef49118c1e654fb5edd43491181a1b9d4e2 SHA512 ab06f30d4bb16e1ba9069dd8224d6235393c8bee8dba7bf239594e25351bc6eae77175a5160cc1463bba719788fb104d4aa882e2480b07e17fce3df160e364f0 WHIRLPOOL eb05b26b132c1b77e1f8bd2e77ea32820efd6ecc0d3e0fb66e66894ea3028f88e9f3d13b77a05f5cca1ad625df9cf8e84b39d382ef29d8b1569b22e3ffafe671
 EBUILD wireshark-99999999.ebuild 6410 SHA256 2e661f057146fc8a4bc364fc93da7b435d89f7769a0faeb0488a0f93883e67d5 SHA512 e80a3b7f08dcffda896ee01d9c08388caf7b6fe59b5756c4954d4041151d99e3b4d85810cc70c5a64ce61598a1c5b58c1369f9d9b4ef49c8570b1b1ff78d9876 WHIRLPOOL 75ddbcdb78932c324c4134e4f5d6f428dbdd2b9ff2453486e7c0d5f41169ac0b97616ab72f48f9448b6f860b3c5a5d5cd8a7892f9ae69fdf34820c0dbcadef8e
-MISC ChangeLog 104288 SHA256 ca5c48fcd922a0e9cb92aef17e810f85d31e8579c83e579b72ecdf0e2dcddd9b SHA512 702e7bdfa84c3f1acb30c05591de813bcdcdaab61e7c9bffec291f3173e04be8e4512077797db1130152cf7b86672a8f8e36fc8dfe82f8eb4f95bb5bc231a089 WHIRLPOOL f1adcce4f3071e430fff2ef6e0e4cc19cbb0b3b0c20d4f95cafd7a2e6583b143e983467ccad657411a0e31925010c2b0bba569ba725b270cad1effc733481cdf
+MISC ChangeLog 104452 SHA256 7509e9b28f44c4e8bc930eb65012908f205191584e848f7ad949f120363e6c33 SHA512 8cb064a4d7578a3452aeb377a42c8a473198fe69412ab1614a86e6028a08797d534421f4c35b1cd31b1953d113c49dfa264913ca9b5b4390555cfc5bcf0c894e WHIRLPOOL 9e901602c2bd0335670763cf29858add75d95005776da8eb08d9453cffa46d5e0610ae082634bae71ec2cf8fb363577f9efc7df34901c8c345ed4eb8dc0e1da3
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVVwyXAAoJEPGu1DbS6WIA9gkP/1ADfPgKtrTiS5W51ALaOyqt
-P0T/M5aJlauwLgvxup21tJzNH5AjnMRNTWkBewucKJc7/VYshTedsqHgLwrhXORb
-MobVIGChEMtlsN9qTSJ1d9pRFafGnHQB5BGKSNZZWYr/69JK8dKUAL63OHLDaflp
-/cO+nUGs+uVaTaq3RZm3sz69p3zRKTGU7QN7/DPWG0Boddc50QAG+Zkl+i26r9Ti
-ttG4KqEMUjEOvNH1kd0IPovnyFxCraa0TtsKjmxIsYO/U+bUM+bZ3Brgu/++GUmu
-vi2D2vf/HEmXTcwKJUDAOP8lxlyWEpt0ZlZtnF/kF30YDIcuHNoFlPurbbjCJpvm
-qW10rxsE1FgCjRSEPR0rS65Bl9av4YjUujCI7d/5WGaKQks6+yh7igM+UMuxenwF
-LK7HxTxJ52uiL+H2HFg3rXDvDHkmYpZ8BjGGAvkEdzcIZFJ5Wwwt3eniW1kR6+To
-i0FlOaiEYz6fhM8rB3H0JsTAGtSj5OwuAjq1VhqSmJXNyrqIEq6k1XNGqnUnLc+j
-mndYs8A/Mdpwq8+Dfwqxp2MFdFmyYil4OpUgVsMEkolJpToCjOhpm9kVlnOC5cH2
-cB/Oik5OkUJeqRdYwkoRkNue8/crpUjuzeUADz6nWSKdjiEuDuCwD7LZ5P093yyv
-b3ZiCkkdShfJj4A79SgF
-=PE0G
+iEYEAREIAAYFAlVrTkAACgkQVWmRsqeSphMabQCfYlnO6VYhJNdiKFxJfOj1jvD2
+VD0An3ZoaRoPXfTLmIOfuhTaLrht+59R
+=01iK
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch b/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch
new file mode 100644
index 000000000000..e7124ad3eca7
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch
@@ -0,0 +1,40 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1735,15 +1735,15 @@
+     CXXFLAGS_saved="$CXXFLAGS"
+     if expr "x$GCC_OPTION" : "x-W.*" >/dev/null
+     then
+-      CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error $GCC_OPTION"
++      CXXFLAGS="$GCC_OPTION $CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error"
+     elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null
+     then
+-      CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
++      CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror"
+     elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null
+     then
+-      CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
++      CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror"
+     else
+-      CXXFLAGS="$CXXFLAGS $GCC_OPTION"
++      CXXFLAGS="$GCC_OPTION $CXXFLAGS"
+     fi
+     AC_LANG_PUSH([C++])
+     AC_COMPILE_IFELSE(
+@@ -1773,7 +1773,7 @@
+               # added them, by setting CXXFLAGS to the saved value plus
+               # just the new option.
+               #
+-              CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
++              CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved"
+             ],
+             [
+               AC_MSG_RESULT(yes)
+@@ -1785,7 +1785,7 @@
+           # added them, by setting CXXFLAGS to the saved value plus
+           # just the new option.
+           #
+-          CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
++          CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved"
+         fi
+       ],
+       [
diff --git a/net-analyzer/wireshark/wireshark-1.99.6.ebuild b/net-analyzer/wireshark/wireshark-1.99.6.ebuild
new file mode 100644
index 000000000000..d5ad4027fc8a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.99.6.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.6.ebuild,v 1.1 2015/05/31 18:09:03 jer Exp $
+
+EAPI=5
+inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="
+	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
+	portaudio +qt4 qt5 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+GTK_COMMON_DEPEND="
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	crypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk3? (
+		${GTK_COMMON_DEPEND}
+		x11-libs/gtk+:3
+	)
+	kerberos? ( virtual/krb5 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4[accessibility]
+		x11-misc/xdg-utils
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[accessibility]
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk3? ( virtual/freedesktop-icon-theme )
+	qt4? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
+		"${FILESDIR}"/${PN}-1.99.6-gcc_option.patch \
+		"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
+		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk3 || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	use qt4 && export QT_MIN_VERSION=4.6.0
+	use qt5 && export QT_MIN_VERSION=5.3.0
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use_enable ipv6) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk3) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		--disable-profile-build \
+		--disable-usr-local \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		--without-adns \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+	if use doc; then
+		use doc-pdf && addpredict "/root/.java"
+		emake -j1 -C docbook
+	fi
+}
+
+src_install() {
+	default
+	if use doc; then
+		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			insinto /usr/share/doc/${PF}/pdf/
+			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
+		fi
+	fi
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		color.h \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk3 || use qt4; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+	fi
+
+	if use gtk3; then
+		domenu wireshark.desktop
+	fi
+
+	if use qt4; then
+		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
+		domenu wireshark-qt.desktop
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}