Version bump.

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

5 files changed, 16 insertions, 263 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index b884d428023d..f10c88360324 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.591 2014/03/08 17:05:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.592 2014/03/08 19:00:38 jer Exp $
+
+*wireshark-1.11.3_pre1889 (08 Mar 2014)
+
+  08 Mar 2014; Jeroen Roovers <jer@gentoo.org> -wireshark-1.11.2-r1.ebuild,
+  -wireshark-1.11.3_pre1650.ebuild, +wireshark-1.11.3_pre1889.ebuild,
+  -files/wireshark-1.11.2-gtk-deprecated-warnings.patch:
+  Version bump.
 
   08 Mar 2014; Jeroen Roovers <jer@gentoo.org> wireshark-1.8.13.ebuild,
   wireshark-1.10.6.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7e3e082a3398..327f3d6ab46d 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,28 +5,25 @@ 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.10.6-gtk-deprecated-warnings.patch 1011 SHA256 8942ead656bc599957344fc00856fcc6abd9ac115a11f3b111dc132c3f0d394b SHA512 eaa454c11ba59d768e14dc726b824f0c8372a68e0697860b4d1a69b2127a166c86a0b97054cd84af43cacd6227dfab7a96036322e686bf91fcb0bd82627a22d2 WHIRLPOOL 39d3c525fa4521c69d64024800e52d91be1bc619c4375119505454fcd52089a93a5ba354cf7d44cc2c7a559c6c7c5dfda904e8af082e83d684b6edc2629e4c81
 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.5.tar.bz2 26666846 SHA256 a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5 SHA512 c72d8f23d3018ece52ccebbaa49f6a389e57ce5ab6df93d26f82888b8ed6fb29dd3caf4f5cb022f153f9589261f5666f7bacaf14b2d64b10f56c4e8ef9cc43e7 WHIRLPOOL f2b12e44ebea344e5dafa58892ae03b1cb140eb116c044ea214ec879d2a24daa2c2bbabba377238cddb32a38426e07ed50b0a997ea065b12e3a8f97a0f43b176
 DIST wireshark-1.10.6.tar.bz2 26719003 SHA256 a9de3fd3002d4df0946cfea2f5a33557666e14c7014dbc42d1f78dfe113f6b5d SHA512 fc6a9416c34ba6bc1b4476723991d557ebd1302db9d26a0d39c77c850147aa52c4b31c32ca63c694c7fed71e5603c3b5737d7d2c7e3e6985f8c4e01110ca9d85 WHIRLPOOL e90989eaa41e8376ef7ab247470702eeb5d987b7e07f159466f150b475acf7a491b94b6f950020f41de5a77958a49269a48611aa1aa8355730ebc4f5a96524b7
-DIST wireshark-1.11.2.tar.bz2 27696007 SHA256 233f7b2e1315982efc34cee60fad6431d2a26f5f68b03b7a439a108bab95f01c SHA512 40b29bc10a106862f521026a1a3e9c9af5a0eeb034fc5f8054e7f9939393a12fe9d3c67df5562461911a1ce2b903624ae750720dbb10c72070b67d5403e678d2 WHIRLPOOL ca193c5718d908ab9b5e86b67423b8aa6c160aee21a678c25039d1caf479d4509b19382213b055588ad284a7272fbe150abeed12c2b9dea8a285b353349f3d99
-DIST wireshark-1.11.3-1650-gb24339e.tar.bz2 28038669 SHA256 e57be474f9ed188ec046641028e3c6652d3aa7dae270eeb7d75090908d07934f SHA512 e2aab95610670f0f0a2a9b0e92b8eac72001be5480dcbc8691f8050cda9231973f2b86efc24d683d36cc4440893ea44d4b57bd333f455cd5c1b07ba5a5f9c79b WHIRLPOOL 2a03293df263c356282de4c15cd7e5b300bf8ecf2dbee6b5af3052081594ecabcb2969af2411d10f79ed7c629304561bce1946793260653f4d20bbb32a89a736
+DIST wireshark-1.11.3-1889-g5f16578.tar.bz2 28089224 SHA256 2a9a337a94ba0fe8deb618813065a29673cf9d53bb63f727a2e990e82ca12fea SHA512 bdfe868db017790bef085e6b44065e1747088cea8d9bb9ba938f571e7d53f161c2e5558488f047ac64bd5787c4555c0b68b8d51a22fb62dae3821968f6b02295 WHIRLPOOL 94e86cb56627cdea2debbe6fd16057a356594b871f92637ecf6c1fa43200c8571645728b4f94cfb097c451f10642b01be210e733146a8ad2591b3ef1e0b4cd2e
 DIST wireshark-1.8.12.tar.bz2 24132271 SHA256 f99080ad249b01c22371cc4e0feae9260312053e0162f1785d6849708bc0cb93 SHA512 3bfc8b2c9657a4c5234cf537a5eac63ea6964476785797ddac191d99f6ec6cd8333389707dc1316221291f9e91542fc933550042f344228b3ea6afbc034a8528 WHIRLPOOL aaa8fe6fbba82adfc6ad81780dff5ca9606db74d1358d24a4f5515f04b83d22d97a66cc937b40a4490b817093a8003202cf0e8485b067abfab04a67f15cddfc1
 DIST wireshark-1.8.13.tar.bz2 24150627 SHA256 0d672e549fa0b30bbde6f68e8f80ccae88017f2320e17df5ffd2507ecc9d6572 SHA512 b6b302a2f00c5ddf2e5ffbadbe2178959ed5b8a7843d8df176f96920a7095e847b513590d90543b4698264ee33c7504663f558a5cba18467301d8bd94a0673cc WHIRLPOOL 668e00974bb4ecb012ee833fc2c49361b464c5c593fbc2957252a95cec9e06efd13c211c76f58b56fdd3d4c99a95c9ca59f447892436eef2a32868f8e312be94
 EBUILD wireshark-1.10.5.ebuild 5759 SHA256 6c276630d1ff90bf241f73c54a5855a760cf414297140e9d209e387b4f73bb8f SHA512 f99b672e2a7387777db8492b30900467b670f61b704493e25135e77a8a6a8f75e564ee34201a8a42e85fc6494bc2427140551063580dbbcc4240976dd46e52b4 WHIRLPOOL 7a7c808c9559e85c71b4cb091cb7b3471f4631ebb75b9db9fd84730ab125d63b89790c9fdee7b7e46635056b7fe85048a51f191b7f7bc6703ea6d1ef7429b103
 EBUILD wireshark-1.10.6.ebuild 5823 SHA256 66996256adff06996ab2217280e351b83b1c17dc1f752d9d9751327f845a6351 SHA512 8a3b35f5802310ec3856317754b3f239db23556faa0ca2066bcb4fa184a5fb81153585d9c61093ee86328b3191546608a912aa0c6592186e4f40f149d68206de WHIRLPOOL 88b838d39bb8ba3340d9c3e64231e554fc9cd386bb77972f094ebb2d82920b4ccd6aba74ca4440bb47756caa8abc8e52c8b95a74c2f9520a1e69fd3cfc9f402d
-EBUILD wireshark-1.11.2-r1.ebuild 5635 SHA256 731f827be21601b7249869cf4d5f2c7eba8f1223d6d4dd56414425d3d8029baa SHA512 1833f206e8422a624ff42e50d98425bbcd9297b02cb3d9818b213f83d4147e5482a3612ceff49b845529f85659ef213a850884d16c2e22a1fe99aef546107ec8 WHIRLPOOL 890d4ef4c16eddd22f97d9459e125e219450816a0ee37fd03f3b7a0a95520cc444a4ec616c4a76349f504330133313f156bdfe7993f4451beac391f28337aeb6
-EBUILD wireshark-1.11.3_pre1650.ebuild 5910 SHA256 981daa4dd85bc5f078508e49c2aa507f402f85b2c470775882f9d60ef71529a9 SHA512 1bf908bf01208a609269b3a048bf6f40217a495db7b0fcd9abad76def673873c8c0b7cfa7ad4fd90466005ed536b8eaaf3a0dc3f84b5dabe23d4423f5a7e16bc WHIRLPOOL 5f675516ece898acb077a604eae3a34db2e5f5812555a4387b27f2ba3a1600814067b5c902183e9032cabf69b954587a48e8cfa679da7d45201d62f4edaf15b3
+EBUILD wireshark-1.11.3_pre1889.ebuild 5910 SHA256 e9cdd243dfede42dc41f89f714a8e9168e4395f5746840977f8702707b8c432c SHA512 4cb76cd3bf3ba7c3f5009257c22a96d0e2ff458380b912a0d64d77dc8d64ab2bd46f137c0b1525f8b0e73acd959df494ab12a3d9cff3aee1e3527dc929511cf2 WHIRLPOOL 75768d319e6664132f8c43bfde5850b780c36656c3af7eb2369ffe1aed02ff860ac42008cc14966a0c3a82df8aae1e8eddba7204c9c482fa6c974000e85d7878
 EBUILD wireshark-1.8.12.ebuild 5573 SHA256 f87ba19dbb1fd21ff48feb6611a6a3b92e662fe233368e5c6bb115e7f84e0baf SHA512 5ec331120c0fe4fe6c752f7d0c69556c9bbfc0772ef89f44948ee257e15cc1142b4cf2c9ddf40cb96e63f6050feb8484b61c0469f471ff975dfc6cceae1bb291 WHIRLPOOL 1833a4b0fa1da9863e00729eca2e9f85100e3349a4a3413ec011d149ac7bb3e94607bf4efc579edcff94709683c054987daa0808fae542d8f4c73a5164be7147
 EBUILD wireshark-1.8.13.ebuild 5637 SHA256 605247a0041588e35805ee0a8785b856ce5bb0b559259a1860d55d05d5526c95 SHA512 12ea245b653937fcbccf444c6c10529bb9982242f7463dd86eb130cb1ec1a36cab9d1e6694c47a6961b920e11003fa2493a7bd5b2dc7642af56b43b112ff2c17 WHIRLPOOL 41f90b28241971fa415cd5a210f2e173642dae3c04757885951ff36b7e13bb1efee0a4824e7aeda2a87df443409a720ada042791986629b07f547aef3a3e188d
-MISC ChangeLog 86777 SHA256 4f210600ec00a35276406e33e53a208d4decffef3534c1c108783bd734dc9c3d SHA512 19b7ed29bcbb7a4f26fc870c4920fa09f77916c2116b31c1e46b27feccca060ede5e774b24cf7b12a5f25b0ccccbea73a1ab5dd193a7d6832037022bc10643c4 WHIRLPOOL 433c95eb917ae779f69b0d8cddc59094e49e47edfe9c95ec9f5134e86c224acbe77a41e42753dc18662a4d6d13702e2676a41faea1a535b090852b0e0a8b6292
+MISC ChangeLog 87038 SHA256 0faa08323bfb3981ba05cc30ba3e03689d864ee15d81010d853984f3e94fad3f SHA512 a346699e87be9f18eae627675988ab01e464044cef9fde1b4e81fefc5c7b1803fcb78a8326c3e7d3c7f2581b84ce6433421e84542ac8e460c8060a43115edf21 WHIRLPOOL 4e37a6225614e28d548bbe7ae9f2073769e8a4b63e001f625f397dad5b594089a36e9555999ae9269100cf0235de49236c221222b0609646fdbcc45830baabb3
 MISC metadata.xml 2662 SHA256 aa3e958ce2704697a912374dfd9df72310353b54883e63de57b1f4e925f804eb SHA512 2eaf02dbd17d346b42dd2ecbb10318c08f8cba0e6bf0cd0dd76f145cc37c1eb35788c4a60d90c42b92c8b7e554315a40046b3b94c5d1a004ebb88650eb296dda WHIRLPOOL 21d6545372ed8aae96efb37f295904a3b14a721e754daf3bab74284d2e7527944fa6c75dc34c3229dea0c815641574f46f72b4b173d0653c6a92bf06341b81a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMbTb8ACgkQVWmRsqeSphMiqwCfa5BTQo+TrvM5tU0nNIY/eckh
-it0AnjBne4zR2DDpO+n5KWcZXHB8u42y
-=qXGb
+iEYEAREIAAYFAlMbaNgACgkQVWmRsqeSphOmeACdFWNtm0wLpiU1G5uGTremP6BP
+sroAnjEDlM2DS4NXf/hPFPDgaaDGRn5p
+=m/XN
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.11.2-gtk-deprecated-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.11.2-gtk-deprecated-warnings.patch
deleted file mode 100644
index 36770dad25d7..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.11.2-gtk-deprecated-warnings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1479,20 +1479,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"
--	CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
--	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.2-r1.ebuild b/net-analyzer/wireshark/wireshark-1.11.2-r1.ebuild
deleted file mode 100644
index b2f4c7c65405..000000000000
--- a/net-analyzer/wireshark/wireshark-1.11.2-r1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# 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.2-r1.ebuild,v 1.2 2014/02/07 18:17:03 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/src/all-versions/${MY_P}.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}/${MY_P}
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
-		"${FILESDIR}"/${PN}-1.11.2-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 dumpcap-group wireshark) \
-		$(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."
-}
diff --git a/net-analyzer/wireshark/wireshark-1.11.3_pre1650.ebuild b/net-analyzer/wireshark/wireshark-1.11.3_pre1889.ebuild
index bfa6588435fb..c149e79aaec1 100644
--- a/net-analyzer/wireshark/wireshark-1.11.3_pre1650.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.11.3_pre1889.ebuild
@@ -1,6 +1,6 @@
 # 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_pre1650.ebuild,v 1.1 2014/02/15 13:54:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.3_pre1889.ebuild,v 1.1 2014/03/08 19:00:38 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps qt4-r2 user versionator
@@ -8,7 +8,7 @@ inherit autotools eutils fcaps qt4-r2 user versionator
 WS_PV="$(get_version_component_range 1-3)"
 WS_REV="$(get_version_component_range 4)"
 WS_REV="${WS_REV/pre/}"
-WS_GIT="gb24339e"
+WS_GIT="g5f16578"
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"