Version bump. Fixes security bug #381551, thank GLSAMaker/CVETool Bot. Added 1.6.2, bug #370683. 1.6.2 also fixes bug 373545 wrt Francesco Lamonica. Drop old.

Package-Manager: portage-2.1.10.15/cvs/Linux x86_64

6 files changed, 21 insertions, 460 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 97e213f4c329..201df04bf53d 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.310 2011/08/07 16:48:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.311 2011/09/12 18:55:52 pva Exp $
+
+*wireshark-1.6.2 (12 Sep 2011)
+*wireshark-1.4.9 (12 Sep 2011)
+
+  12 Sep 2011; Peter Volkov <pva@gentoo.org> -wireshark-1.4.4.ebuild,
+  -wireshark-1.4.6-r1.ebuild, -wireshark-1.4.7.ebuild, +wireshark-1.4.9.ebuild,
+  -wireshark-1.6.0_rc1.ebuild, +wireshark-1.6.2.ebuild:
+  Version bump. Fixes security bug #381551, thank GLSAMaker/CVETool Bot. Added
+  1.6.2, bug #370683. 1.6.2 also fixes bug 373545 wrt Francesco Lamonica. Drop
+  old.
 
   07 Aug 2011; Raúl Porcel <armin76@gentoo.org> wireshark-1.4.8.ebuild:
   alpha/ia64/sparc stable wrt #373961
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 596c9fa71745..da09ec104745 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478
 AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf6e85855c SHA1 a18b6fcc85b40c00fc1d30bcdfc81d13dc33e904 SHA256 d2f996a79fa3117296b25c10a1d4a3f0f8027a678de4e37e6c60bfb47a4754b9
 AUX wireshark-1.0-sigpipe.patch 850 RMD160 a240a1317681516d207ca1694b0e44584008530b SHA1 8f127c22daa77ce9f658f3b1d3f897e428ee9dde SHA256 3a5130838a48b65cb21b4e25913347cee05689b4641c1dfb407facf9fa4f9f59
@@ -10,22 +7,11 @@ AUX wireshark-1.2.8-zlib-1.2.5-capture.patch 779 RMD160 7440a7d8a04a1b43057fc7c1
 AUX wireshark-1.4.6-gnutls_nettle.patch 733 RMD160 9b8839b432b5c6231068d784d9fd3e151c509dd1 SHA1 2592ac7fd110cfff4b70a6456fdf655f5aca45cf SHA256 6698b83bd455b626f46c2d446a6c69f6f4c6822f63207ffb1052accde881fc76
 AUX wireshark-1.4.6-wspy_dissectors_dir.patch 460 RMD160 098cc8aa80433dff0423cf64d88be89d7716fffa SHA1 fd23ab1494482e8825c79dfc5df2cac42fbcf97d SHA256 ed59b5d0af20d3c7adffa7742c245e8640e593e519200149810df4022eb8442e
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
-DIST wireshark-1.4.4.tar.bz2 20479081 RMD160 47f9274cd6933684339b4c7c0b7c723d8c9b1512 SHA1 4d1d7e7bf07683723b661eb7b7124b2e90106087 SHA256 6033e627c40ac4eec7e95c03728b497ee2bc5851af8c9e58bb89b7496717dc0d
-DIST wireshark-1.4.6.tar.bz2 20496268 RMD160 7ecb1c006eb70858e21019a731d038478a3f7879 SHA1 dd283b3957d1096bd643ab4b83b19dd2d7d6bfd8 SHA256 f923f1e923dcb479b7fdb9bc6d4ce4c27ae8ac1f0148f2820bece476872df1d7
-DIST wireshark-1.4.7.tar.bz2 20515206 RMD160 012ec4d7750c03bcc23e9140f31e778cde6fd645 SHA1 ba80ed0c2aa6a12fa50155bbf5b58ad41a46024e SHA256 6671a185d3cd5222a04b6c425d2ef70b84e50ebf50ace9738ae772e87bf492c1
 DIST wireshark-1.4.8.tar.bz2 20505798 RMD160 970ada8ccbbca17695038faf4c0bca83d126d9a4 SHA1 8f9d0a920d00ac22ae0b2fa5844adbadc7e2de1e SHA256 fb393a9e6f8873de8dff5dca6f0c35a0e505eab954ef6aaeec3cecb0a4eef0da
-DIST wireshark-1.6.0rc1.tar.bz2 21833197 RMD160 e3455efe740dd41698b3369afde9673da05789b7 SHA1 89d374a6607e7afc164da7e330e405b335484720 SHA256 d19e40268f0201ca628d7b94e620b39cd180e35d9fe3dcb7da84aaeec2d5b6c2
-EBUILD wireshark-1.4.4.ebuild 6421 RMD160 1fbf49245dd450987856071934644cf22ced3920 SHA1 71a83f0e0309cedfd22fbfb8b29a4cac32508bfb SHA256 e0d6357ba32e47652a5b315f955a4e67ae63c2e504d50749804b2d3dd0441ef9
-EBUILD wireshark-1.4.6-r1.ebuild 6438 RMD160 b9396760261ba162392ad478c01f5483352306cd SHA1 29ca80c30971bbc29307513228a756e265fb0c1e SHA256 445a08c69835d3d5fc36bd343b44c09819719203b1d707d1b7327d43be22d05b
-EBUILD wireshark-1.4.7.ebuild 6308 RMD160 ef6f69013a974b6a0b738678c12338576f99e691 SHA1 19d78fcf6f29fd547061975a5ebdb81ca460acf5 SHA256 93128fcb3b80fb55d14ebe1764e151ef5e05cdcf891c7909ee65fd6766c85946
+DIST wireshark-1.4.9.tar.bz2 20604645 RMD160 e8f6d68b5b49607fa337ef05ff6bd6c5acdb2e60 SHA1 242e8faf76ec219ddc28688517865ce19c611cd6 SHA256 e554f855cba4091779feb3d9d452716a8f87a549d8c27a4e2c700b0cb12dc984
+DIST wireshark-1.6.2.tar.bz2 21408664 RMD160 e343d9bb5600b236dea708bb68ecad805a9ee20a SHA1 a18d4e8eaf56fe0214b19d7fde0eb91a06817a49 SHA256 5343f514ce98c28498ec4734e40e34e2bbf779a6c57d958837e3f70234471e7f
 EBUILD wireshark-1.4.8.ebuild 6305 RMD160 8eebc2bb0bd78f3c90be6376deeabd6f6960a3f2 SHA1 6e6d361ddd121dbff10428fa19a839e52f916f11 SHA256 c18da7b2acf40155d49286c797473091701c6235123a008818dadcf8f2de0da8
-EBUILD wireshark-1.6.0_rc1.ebuild 6282 RMD160 faaf02da6806748f3cc6f9492339caedabe1b059 SHA1 3912d612eddbddcb6e9189136e98a1a5723c02a2 SHA256 d9e8e01d9fad77a2e01a34bf5ccac11153d4dfa733fd281cde5f86aa8d0a325b
-MISC ChangeLog 44848 RMD160 683ea78f163848be6b3c4267f262c55dcf99c50c SHA1 de2d909bee64b4f7719168dd445a8b90d9d1f150 SHA256 76523245375924b3fdf97ac06b3c0cd142f798b1d2d1efafdc3a8423036ca8af
+EBUILD wireshark-1.4.9.ebuild 6309 RMD160 afaa6d85bab752ba8a5d966b6caa70eb4ff80429 SHA1 444a55fe3715d4733f7ecb3a84c0f0fe57862281 SHA256 f8e79638ea57a15c1646568fafcb301111d19ce917579bd333c8ba2e6fbe0b3c
+EBUILD wireshark-1.6.2.ebuild 6315 RMD160 7bd88e4d7009dee6cc65d2e2a0ccb7411804f49e SHA1 c24b9b04671fb26c508185997ff11ca2a10ac4b4 SHA256 1eee0327c11708795aaac2af165f31bb0ee8039a1698b58ecf07f421f6551a1d
+MISC ChangeLog 45279 RMD160 85d9f4b4acdc842da15a27ff24a62a6cfe151075 SHA1 262305801522011416b55a05735aee7cd931657d SHA256 9d2838c419948f5df8881fd512302db9102b0cdc208414ad7bcf80c1e0db4ab5
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4+wfEACgkQuQc30/atMkC6fgCfe5ahdCViuEAb9PSMZMMrK0vS
-iRYAniDhjkDPhtpD3ZAmUWzTke76shyN
-=RaqX
------END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.4.4.ebuild b/net-analyzer/wireshark/wireshark-1.4.4.ebuild
deleted file mode 100644
index 5972ad7348da..000000000000
--- a/net-analyzer/wireshark/wireshark-1.4.4.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.4.ebuild,v 1.7 2011/03/13 11:23:51 xarthisius Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-inherit libtool flag-o-matic eutils toolchain-funcs python
-
-[[ -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"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
-profile +pcap pcre portaudio python +caps selinux smi ssl threads zlib"
-
-RDEPEND=">=dev-libs/glib-2.14.0:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-misc/xdg-utils )
-	ssl? ( net-libs/gnutls )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	pcre? ( dev-libs/libpcre )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	ares? ( >=net-dns/c-ares-1.5 )
-	!ares? ( adns? ( net-libs/adns ) )
-	geoip? ( dev-libs/geoip )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt
-		dev-libs/libxml2
-		app-doc/doxygen
-		doc-pdf? ( dev-java/fop ) )
-	>=dev-util/pkgconfig-0.15.0
-	dev-lang/perl
-	sys-devel/bison
-	sys-apps/sed
-	sys-devel/flex"
-
-S=${WORKDIR}/${MY_P}
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
-		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
-		ewarn "${path}"
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
-
-pkg_setup() {
-	if ! use gtk; then
-		ewarn "USE=-gtk disables gtk-based gui called wireshark."
-		ewarn "Only command line utils will be built available"
-	fi
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_configure() {
-	local myconf
-
-	if [[ $(gcc-major-version) -lt 3 ||
-		( $(gcc-major-version) -eq 3 &&
-			$(gcc-minor-version) -le 4 ) ]] ; then
-		die "Unsupported compiler version, please upgrade."
-	fi
-
-	if use ares && use adns; then
-		elog "You asked for both, ares and adns, but we can use only one of them."
-		elog "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
-		myconf="$(use_with ares c-ares) --without-adns"
-	else
-		myconf="$(use_with adns) $(use_with ares c-ares)"
-	fi
-
-	# profile and pie are incompatible #215806, #292991
-	if use profile; then
-		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
-		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
-		append-flags $(test-flags-CC -nopie)
-	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
-
-	# 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, setuid-install requires dumpcap
-	econf $(use_enable gtk wireshark) \
-		$(use_enable profile profile-build) \
-		$(use_with ssl gnutls) \
-		$(use_with gcrypt) \
-		$(use_enable ipv6) \
-		$(use_enable threads) \
-		$(use_with lua) \
-		$(use_with kerberos krb5) \
-		$(use_with smi libsmi) \
-		$(use_with pcap) \
-		$(use_with zlib) \
-		$(use_with pcre) \
-		$(use_with geoip) \
-		$(use_with portaudio) \
-		$(use_with python) \
-		$(use_with caps libcap) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use pcap && use_enable !caps setuid-install) \
-		--sysconfdir=/etc/wireshark \
-		--with-dumpcap-group=wireshark \
-		--disable-extra-gcc-checks \
-		${myconf}
-}
-
-src_compile() {
-	emake || die
-	use doc && cd docbook && { emake || die; }
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use doc; then
-		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-#		for dir in ws{d,u}g_html{,_chunked}; do
-#			dohtml -p ${dir} -r docbook/${dir}/ || die
-#		done
-		if use doc-pdf; then
-			insinto /usr/share/doc/${PF}/pdf/
-			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf || die
-		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*}
-
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h || die
-
-	if use gtk; then
-		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
-		domenu wireshark.desktop || die
-	fi
-	chmod o-x "${ED}"/usr/bin/dumpcap #357237
-}
-
-pkg_postinst() {
-	if use caps && use pcap; then
-		fcaps 0:wireshark 550 cap_net_raw,cap_net_admin "${ROOT}"/usr/bin/dumpcap
-	fi
-	echo
-	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."
-	echo
-}
diff --git a/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild b/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild
deleted file mode 100644
index f779bda49899..000000000000
--- a/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild,v 1.8 2011/05/15 13:41:04 pva Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-inherit libtool flag-o-matic eutils toolchain-funcs python autotools
-
-[[ -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"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
-profile +pcap portaudio python +caps selinux smi ssl threads zlib"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-misc/xdg-utils )
-	ssl? ( net-libs/gnutls )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	ares? ( >=net-dns/c-ares-1.5 )
-	!ares? ( adns? ( net-libs/adns ) )
-	geoip? ( dev-libs/geoip )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt
-		app-text/docbook-xml-dtd:4.2
-		dev-libs/libxml2
-		app-doc/doxygen
-		doc-pdf? ( dev-java/fop ) )
-	>=dev-util/pkgconfig-0.15.0
-	dev-lang/perl
-	sys-devel/bison
-	sys-apps/sed
-	sys-devel/flex"
-
-S=${WORKDIR}/${MY_P}
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
-		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
-		ewarn "${path}"
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
-
-pkg_setup() {
-	if ! use gtk; then
-		ewarn "USE=-gtk disables gtk-based gui called wireshark."
-		ewarn "Only command line utils will be built available"
-	fi
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gnutls_nettle.patch"
-	epatch "${FILESDIR}/${P}-wspy_dissectors_dir.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if [[ $(gcc-major-version) -lt 3 ||
-		( $(gcc-major-version) -eq 3 &&
-			$(gcc-minor-version) -le 4 ) ]] ; then
-		die "Unsupported compiler version, please upgrade."
-	fi
-
-	if use ares && use adns; then
-		elog "You asked for both, ares and adns, but we can use only one of them."
-		elog "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
-		myconf="$(use_with ares c-ares) --without-adns"
-	else
-		myconf="$(use_with adns) $(use_with ares c-ares)"
-	fi
-
-	# profile and pie are incompatible #215806, #292991
-	if use profile; then
-		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
-		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
-		append-flags $(test-flags-CC -nopie)
-	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
-
-	# 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, setuid-install requires dumpcap
-	econf $(use_enable gtk wireshark) \
-		$(use_enable profile profile-build) \
-		$(use_with ssl gnutls) \
-		$(use_with gcrypt) \
-		$(use_enable ipv6) \
-		$(use_enable threads) \
-		$(use_with lua) \
-		$(use_with kerberos krb5) \
-		$(use_with smi libsmi) \
-		$(use_with pcap) \
-		$(use_with zlib) \
-		$(use_with geoip) \
-		$(use_with portaudio) \
-		$(use_with python) \
-		$(use_with caps libcap) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use pcap && use_enable !caps setuid-install) \
-		--sysconfdir=/etc/wireshark \
-		--with-dumpcap-group=wireshark \
-		--disable-extra-gcc-checks \
-		${myconf}
-}
-
-src_compile() {
-	emake || die
-	use doc && cd docbook && { emake || die; }
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	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 || die
-		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*}
-
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h || die
-
-	if use gtk; then
-		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
-		domenu wireshark.desktop || die
-	fi
-	chmod o-x "${ED}"/usr/bin/dumpcap #357237
-}
-
-pkg_postinst() {
-	if use caps && use pcap; then
-		fcaps 0:wireshark 550 cap_net_raw,cap_net_admin "${ROOT}"/usr/bin/dumpcap
-	fi
-	echo
-	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."
-	echo
-}
diff --git a/net-analyzer/wireshark/wireshark-1.4.7.ebuild b/net-analyzer/wireshark/wireshark-1.4.9.ebuild
index 7e26a9962c8c..2630a0dab070 100644
--- a/net-analyzer/wireshark/wireshark-1.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.7.ebuild,v 1.8 2011/06/07 10:15:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.9.ebuild,v 1.1 2011/09/12 18:55:52 pva Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -13,7 +13,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
 profile +pcap portaudio python +caps selinux smi ssl threads zlib"
 
diff --git a/net-analyzer/wireshark/wireshark-1.6.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-1.6.2.ebuild
index bac9ad725e1e..90393636a066 100644
--- a/net-analyzer/wireshark/wireshark-1.6.0_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.0_rc1.ebuild,v 1.1 2011/05/24 10:44:24 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.2.ebuild,v 1.1 2011/09/12 18:55:52 pva Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -46,7 +46,8 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	sys-devel/bison
 	sys-apps/sed
-	sys-devel/flex"
+	sys-devel/flex
+	!!<net-analyzer/wireshark-1.6.0_rc1"
 
 S=${WORKDIR}/${MY_P}