Version bump.

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

4 files changed, 268 insertions, 16 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index db2f43265df7..ef747313e4b5 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/wireshark
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.581 2013/12/23 11:55:58 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.582 2014/01/08 17:10:36 jer Exp $
+
+*wireshark-1.11.3_pre54663 (08 Jan 2014)
+
+  08 Jan 2014; Jeroen Roovers <jer@gentoo.org>
+  +wireshark-1.11.3_pre54663.ebuild,
+  +files/wireshark-1.11.3-gtk-deprecated-warnings.patch:
+  Version bump.
 
   23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> wireshark-1.10.5.ebuild,
   wireshark-1.8.12.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7920414a0c57..c2a4792e2cb6 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,34 +5,27 @@ AUX wireshark-1.10.1-oldlibs.patch 795 SHA256 2ae88c478ea5c76cbb6eeb6fabb93ed85e
 AUX wireshark-1.10.4-gtk-deprecated-warnings.patch 714 SHA256 a1ec1a9025194bb1c847ba62019202df2494c1b8a4bbee5b6cc70d9b08583e5d SHA512 21b534d53c2dae04e65423cc69aea3d4748e5fc8993443b9a3a51c400c3d80fa195da167e95c633866460691e00a2b9ec71e502b9620e424604105c5b3ddd07f WHIRLPOOL 1839d24a7bc8866c02edf6d2d1383f776a29d7c5436803eb0b3647e0484b122a63b72d2be486097b90fd06b769c0146691ce278c769b4e8df089bcddbb5602e8
 AUX wireshark-1.11.0-oldlibs.patch 776 SHA256 0b4b23ad3ce7022809187ce970733a4c6bdb9fed31099853b399498fde8dee66 SHA512 dde2cbfd839409c594562b71783204279c37697939d44ee56ce4966d7dd43d04ab5837bd51551c416ec789b56f8efd0016e6ecc2311af8b3109e987da301bef6 WHIRLPOOL 57fb7f67166440208c5fe023f8c7e62a4f860ae5fecf02df6e9b8b45fe31c999f7eeeee83914bbfc26c656c69bfceee75c94f9ac80c64ebd0c1d6db792b66665
 AUX wireshark-1.11.2-gtk-deprecated-warnings.patch 771 SHA256 0d50a37bf81821eda032e257554974dd610559bdfd717da78fce6386d8e9ac40 SHA512 f706e5ea19968062090121db60c01005b6780481019a1e6a43c6e93a289f998d54883218e0a64bae2bfce2949ad503dc75fc041307f84086911ab9ab584adf74 WHIRLPOOL 73d599d719b2f288e88e5ce26fe4b9390e31b861e08283d3c9869087a8a8a0ef6362a1646c4eebb4f7084850eb63a8b22d6e0cc3b8a4cd222e6218c0de456dcf
+AUX wireshark-1.11.3-gtk-deprecated-warnings.patch 1068 SHA256 0211d3f345617554add63f3101a548a990e26219b31b28003e4dbf607d38de88 SHA512 9ea643e8f707d9f9fe3ce61b875ae1828c77cd81c636423fc5572420fd3b103042e078f89541c5145db49f133828d333c55d1c2c3b9a162f0756051ef9d946b9 WHIRLPOOL b04cad3b70bc37b9cbc833227bdf9c32c17e67ad067902d3fb35f467fb76520546ecd508de1805ef810b76ebe4f0b686e483817c790cb4ede75c229505596502
 AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a53003e9fa47869f54c6f2f30d315720 SHA512 c4a2c66e6ea9b523ca9f5a3e37411221f5aa630de07d7bf84633855ac44da60b3b493671e578dbfd67de94e87ab1c79203f9b80b57f9460f2a81ee39f58171b3 WHIRLPOOL ca20e190c7a8d7ca69c6d90cfb28f8f1c8896b6793b9a026567ec4df4f7080ca6424ab249d01754db1059891d32362444178272489b4425e895f3031a0e1e0f7
 AUX wireshark-1.8.12-gtk-deprecated-warnings.patch 940 SHA256 9969d68caeb0277ef78b4fa2078aafe6ffb2452de68b17bea5882a1b474ccf00 SHA512 e4bb971475ed019d6231179213f6fc9641d0ea91bac89ae0871e351b4def31741c6d3a9e0ff45fbc741e82804d1db5b1ff3f902d9aa22f598292009716a2f3b0 WHIRLPOOL d482ee4e9c74867e01104a1f85804535e791350006ad90e64c51887904c389d684223c3de1569e0261372e7cb3fa186b0d9cdc75831246644761f170751fca73
 DIST wireshark-1.10.3.tar.bz2 26672853 SHA256 c1641b36aeb0ca2c1a95fb01d2c647888b65e00a215c9a6464b5fc61e0fd498c SHA512 38a0cb0382789d62acc273bd9751c7c06b4891313dbe3fbd8a4dfaa64a1b5b9f9649a539204053835a70951b259b4ae64f67d3a2064cfa7089ef1390bd0be2be WHIRLPOOL 768c480e9caf580bfdad5f265a13d967eefcfb4cee7607eca8c33c8f115fc2e4102fc1e994282d20da1a9c421d59db5fd56b4e08efedf3c9981b5b86395e1b65
 DIST wireshark-1.10.5.tar.bz2 26666846 SHA256 a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5 SHA512 c72d8f23d3018ece52ccebbaa49f6a389e57ce5ab6df93d26f82888b8ed6fb29dd3caf4f5cb022f153f9589261f5666f7bacaf14b2d64b10f56c4e8ef9cc43e7 WHIRLPOOL f2b12e44ebea344e5dafa58892ae03b1cb140eb116c044ea214ec879d2a24daa2c2bbabba377238cddb32a38426e07ed50b0a997ea065b12e3a8f97a0f43b176
 DIST wireshark-1.11.2.tar.bz2 27696007 SHA256 233f7b2e1315982efc34cee60fad6431d2a26f5f68b03b7a439a108bab95f01c SHA512 40b29bc10a106862f521026a1a3e9c9af5a0eeb034fc5f8054e7f9939393a12fe9d3c67df5562461911a1ce2b903624ae750720dbb10c72070b67d5403e678d2 WHIRLPOOL ca193c5718d908ab9b5e86b67423b8aa6c160aee21a678c25039d1caf479d4509b19382213b055588ad284a7272fbe150abeed12c2b9dea8a285b353349f3d99
+DIST wireshark-1.11.3-SVN-54663.tar.bz2 27947248 SHA256 1c2ae4aef2c3212ffa0317dda776e7289fca9cb42a99cf6316101ae842041b54 SHA512 5451868de9e642e75b4811154e38e6863b7104b92dc88dab5857708ec9bad0e3a580f9639915e583c2391d170975eb54b57cbc255e67e3320663f354ff8babfb WHIRLPOOL 6b2a69ff17831718912a7dd7fa99e4714a5c8496a60c5ef3aaa85cf1c8c7f6d2c0ea2a67ab4d5bf9fb38d03b942ea9d7e3c71660ad36eafe120d8dae45f88efe
 DIST wireshark-1.8.11.tar.bz2 24131276 SHA256 fcba2bd7ccd85d0d68cda18d0d6422be45a7f04dcd897b59a4aa859ff48f8fdb SHA512 4b361e6750906c3680d443bbf7bafb3b882577b883e270835fecef541aaaef507230a4699fa3400f955244a0f6b2c724133d52ba8f013b7c8ed02486b733d411 WHIRLPOOL 7da0331c5a5506cb1056fc2c5903b57650b6acb3ca728fd656c8eeb2cfc308c870f82267b026a169b8c7ae927c7f876bba8f188efa3206e07bf9b82ec307e1d9
 DIST wireshark-1.8.12.tar.bz2 24132271 SHA256 f99080ad249b01c22371cc4e0feae9260312053e0162f1785d6849708bc0cb93 SHA512 3bfc8b2c9657a4c5234cf537a5eac63ea6964476785797ddac191d99f6ec6cd8333389707dc1316221291f9e91542fc933550042f344228b3ea6afbc034a8528 WHIRLPOOL aaa8fe6fbba82adfc6ad81780dff5ca9606db74d1358d24a4f5515f04b83d22d97a66cc937b40a4490b817093a8003202cf0e8485b067abfab04a67f15cddfc1
 EBUILD wireshark-1.10.3.ebuild 5694 SHA256 cc44c1d7ed92f5a4ef75f2fccd8ebc5e985e21d637b8ca19dfe7e16655eb0b19 SHA512 21337cf88d2f1d8db8189ef4f7fec2c92dfa28a82ed6fed160c2dc31125867e9e57d26546e44e5cad5b616d980eae534f206ab6e61a2b46f86a3333a4ce6725b WHIRLPOOL 78d634d19fd82303e79bf3db9608e96b6cb57da4cef29e11d3d5e772a84ee0107be6292049bf2738bc06d7e0f0fd16fe10002de36a83f128463b49c5ac2e75ab
 EBUILD wireshark-1.10.5.ebuild 5755 SHA256 ba4782339658916599a875bb2fa4788b3a2f090a2272343540fcfeac8c210aef SHA512 3b78467255808582947f8c0c95a99c11cca05a7d40b2c90c4c17b662fefe158a3a388bbeba04ef70da8c0b5dce35aba9a27ce5b22e6b9d555689bf1edf01a05b WHIRLPOOL 069ed6859c8bd7b4caa6def4e448e0224467d41f1b5c4ed295b325e03e7b982464118bc4965ea2b06280ac3809e140b41c0702eb3c20a5088943160c8d13d798
 EBUILD wireshark-1.11.2.ebuild 5549 SHA256 fb771c29ca2d4c0b7634a7cb5e2055dd064e2838810167224ae8752330f58550 SHA512 3537fdcf3b9674015547452d720c602a35cbbec822322249c52b6053da6dceefd00fe36980e059fa3e56d40c271c3afb630f2407bd9c58a7ed1cee389c611749 WHIRLPOOL a76a587905f4d3ff609f14304a3a76d66d93f7a707dcde8ffe2d3d3783e2a8ce24b04904ef6494a6b29ab0ff3fe64928e9f53e401096e7cf9c208f4b8d88ab35
+EBUILD wireshark-1.11.3_pre54663.ebuild 5593 SHA256 a66b9b214d5931b0951de19b08a765579d598dd59a06091e5afcd346d091e997 SHA512 706dfa2640d1d1aec4b36576fd000c9ba7e11cb4a0c755ea9285924f25681ca0fdd460a3becba67647a9ec59ddead588d2ea5c00b1835e1a163b9591b2762280 WHIRLPOOL 8774749ab631b6a4432c107931547fc2177c6f4cfb0927509884cc14e67940f98a1f397859d1e5f534acdaef0aa7018a68a28be0a1c69a322632830539ac6b38
 EBUILD wireshark-1.8.11.ebuild 5504 SHA256 0c2717e88b54db24fed99061651415329b0a9a186834b9b8383bde4ad61c585d SHA512 a78f48906dfa17665cb976f3d53cd73f2d1e6e2c300c12a8904fe78ae3754fe5cec467b2815210d49e57ee2fed9d10575017f7faa7bc586415e6ea2c794075a8 WHIRLPOOL bea372ef4bd0de7b617d2ea2ddd3c05b6dfa506a28af5aa4b2f073c04d58ee3e05aaf271fb5a7e8a425cc1c529a1cd0dc892c98d84d168717da35413b4a0c490
 EBUILD wireshark-1.8.12.ebuild 5569 SHA256 b25a2f70c7bda5011c6105aa0db7010f8138c51fa62f5a112568ac71ec98d8bf SHA512 2992e497c27b13e52f994b21aac3589332ce7a3e33db337b9a7ac80bc8f8d1cff6721e2d94bbc5c17a1acb49d7f06a2df686bae549b6fbe9e64a48af0c476b13 WHIRLPOOL 365376ca988945b97a71b69a7c256984dff9d1b0aaeb8536a0b8a3d1e8c19d1145168df887b6580ac4c21ffd973b6a50b055cf0a2755283da96fec9a6bc0777a
-MISC ChangeLog 84982 SHA256 93566b1502655d5288578b226baee5c52a1ebaa1fa8c61b2b3600e6b6e2aa709 SHA512 e626d81c1e8abe16bf6a61bdad27a39df14171c69c3680a72840f4476036fe2d9e6366f3fe029d051056a2d9f668c7c91b493dee34f539a5934e7b7c14fa2dab WHIRLPOOL fbac00065c5e54b5e3a442d42689b0aac62e6ea545466fd51674cdba078f265248bd9f51a4f94d9fae401945f68b91099637dbf8e7c3d72711bb6be0d77375cd
+MISC ChangeLog 85182 SHA256 c5c29f12364607b10fc683156df6259d3f11bba9f039dd9368c2a10a5f672746 SHA512 0371da21f7bd922452bca9f5fd17c2960c4b4dd88ad66e86e841183236cb04d71df3a0425ccd502c31a4126bd1de283fdee8aea4e5f4da388bdcf1937f62f1e8 WHIRLPOOL 84ed5fbcda8ee889e26b0df1aa997eb7bb1a5eeecf4cd171a7f64dae13e07a04824e3ad0eb28912708c476dec6f230ceca49962a4233d169e9660e1422baf828
 MISC metadata.xml 2662 SHA256 aa3e958ce2704697a912374dfd9df72310353b54883e63de57b1f4e925f804eb SHA512 2eaf02dbd17d346b42dd2ecbb10318c08f8cba0e6bf0cd0dd76f145cc37c1eb35788c4a60d90c42b92c8b7e554315a40046b3b94c5d1a004ebb88650eb296dda WHIRLPOOL 21d6545372ed8aae96efb37f295904a3b14a721e754daf3bab74284d2e7527944fa6c75dc34c3229dea0c815641574f46f72b4b173d0653c6a92bf06341b81a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuCTQAAoJELp701BxlEWfPPAP/3bCfPgI+jXGONo18LSFbSMk
-Yo71YE6Xs7dVtZMYL8MyJQVsYJOJrQWrstTCHE8++S7j+oAPrJr6VQzoyTuLzJhO
-9obNidHTKgnhFe8FGTuS3DoSn6qzJWeiQbmnORQsm059f364FNBoa7cL3UxiQ+EL
-qgf+EDLuOchrMtryNaBDkAYtm9yJ+qlhyDfovIn3L3C/jVTT8ohaq37IbozaRnoW
-hAtZ1GpE5Dx6/uRAQqCqL69cQ+AIHYWKsH0R8Yph2tMANn2J1+5sPzcPVuuKgiFC
-AXhpqsDzn66pH+pHNx4XuUNc9FJHCjy/CSR07KffS5xtI5wjT7qoQPcEVWryttWH
-0W5YZ7ryKxVRMz8IcFJHvzAvbuZG0J6j5Q1wwm0aBGOV1DIL4tpCS7NyaaneUway
-H8LUfs9TdJmbAg4jxiXMwjRZ2UDW8QBdEIDr5FJ6qmF3JTu53BH4P9V1l1finA01
-yQLYJxuMNiNksXnoikY8TGyBoMVshwxMlcm1Z8EEiPHCNmFRAqlAR/sWL2szFaLc
-IGFN9sBXXXhsCQOB8gp/cHf4ruacU80PJuoWkciKtgLY4ykErGuEhExitVXfH6PK
-23bJPuPoIUU+NKiKt7uTwPr9tK7SjT3Ed1TotuK5SqpxKc1eopVuHuxXlsgQ4o45
-k/GoJTuTAg535FUYBjhb
-=hIcJ
+iEYEAREIAAYFAlLNho4ACgkQVWmRsqeSphOayQCfTJtwZOFDtm1rICJQpCSl7pEF
+ZJgAnilqEegneR9Vwchfivz+BAs2vw2f
+=Qvxp
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch
new file mode 100644
index 000000000000..1e87ce6e2bb2
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch
@@ -0,0 +1,29 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1491,26 +1491,6 @@
+ 	wireshark_man=""
+ fi
+ 
+-if test "$have_gtk" = "yes" ; then
+-	# If we have GTK then add flags for it.
+-
+-	CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
+-	CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
+-	if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
+-		## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;
+-		##  The deprecations in Gtk 3.10 will not be fixed ...
+-		CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS"
+-	else
+-		CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+-	fi
+-	CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
+-	if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
+-		# Enable GSEAL when building with GTK > 2.20
+-		# (Versions prior to 2.22 lacked some necessary accessors.)
+-		CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
+-	fi
+-fi
+-
+ # XXX - Is this really necessary?  When we build with both Gtk+ and Qt it works...
+ if test "$use_glib_cflags" = "true"; then
+ 	# Use GLIB_CFLAGS
diff --git a/net-analyzer/wireshark/wireshark-1.11.3_pre54663.ebuild b/net-analyzer/wireshark/wireshark-1.11.3_pre54663.ebuild
new file mode 100644
index 000000000000..26a17431bdbb
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.11.3_pre54663.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.3_pre54663.ebuild,v 1.1 2014/01/08 17:10:36 jer Exp $
+
+EAPI=5
+inherit autotools eutils fcaps user
+
+[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+SRC_URI="http://www.wireshark.org/download/automated/src/${P/_pre*}-SVN-${PV/*_pre}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="
+	adns +caps crypt doc doc-pdf geoip gtk2 +gtk3 ipv6 kerberos libadns lua
+	+netlink +pcap portaudio +qt4 selinux smi ssl zlib
+"
+REQUIRED_USE="
+	?? ( gtk2 gtk3 )
+	ssl? ( crypt )
+"
+
+GTK_COMMON_DEPEND="
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+RDEPEND="
+	>=dev-libs/glib-2.14:2
+	netlink? ( dev-libs/libnl )
+	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
+	crypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk2? (
+		${GTK_COMMON_DEPEND}
+		>=x11-libs/gtk+-2.4.0:2
+	)
+	gtk3? (
+		${GTK_COMMON_DEPEND}
+		x11-libs/gtk+:3
+	)
+	kerberos? ( virtual/krb5 )
+	libadns? ( net-libs/adns )
+	lua? ( >=dev-lang/lua-5.1 )
+	pcap? ( net-libs/libpcap[-netlink] )
+	portaudio? ( media-libs/portaudio )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		x11-misc/xdg-utils
+		)
+	selinux? ( sec-policy/selinux-wireshark )
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	>=virtual/perl-Pod-Simple-3.170.0
+	sys-devel/bison
+	sys-devel/flex
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-Local
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P/_pre*}-SVN-${PV/*_pre}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
+		"${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use adns; then
+		if use libadns; then
+			myconf+=( "--with-adns --without-c-ares" )
+		else
+			myconf+=( "--without-adns --with-c-ares" )
+		fi
+	else
+		if use libadns; then
+			myconf+=( "--with-adns --without-c-ares" )
+		else
+			myconf+=( "--without-adns --without-c-ares" )
+		fi
+	fi
+
+	# 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 gtk2 || use gtk3 || use qt4 ; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	# 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 caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk2) \
+		$(use_with gtk3) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with netlink libnl) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with qt4 qt) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		--disable-extra-gcc-checks \
+		--disable-profile-build \
+		--disable-usr-local \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+	use doc && emake -j1 -C docbook
+}
+
+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 $( echo $(< debian/wireshark-dev.header-files ) ); 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 gtk2 || 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 gtk2 || 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 run wireshark as normal user you have to add yourself to"
+	ewarn "the wireshark group. This security measure ensures that only trusted"
+	ewarn "users are allowed to sniff your traffic."
+}