Fix gcc 3.4 bug #165340 thanks to Guenther Brunthaler for the solution, do some clean...
authorMarkus Ullmann <jokey@gentoo.org>
Wed, 18 Apr 2007 11:58:31 +0000 (11:58 +0000)
committerMarkus Ullmann <jokey@gentoo.org>
Wed, 18 Apr 2007 11:58:31 +0000 (11:58 +0000)
Package-Manager: portage-2.1.2.3

net-analyzer/wireshark/ChangeLog
net-analyzer/wireshark/Manifest
net-analyzer/wireshark/files/digest-wireshark-0.99.4 [deleted file]
net-analyzer/wireshark/files/digest-wireshark-0.99.4-r1 [deleted file]
net-analyzer/wireshark/wireshark-0.99.4-r1.ebuild [deleted file]
net-analyzer/wireshark/wireshark-0.99.4.ebuild [deleted file]
net-analyzer/wireshark/wireshark-0.99.5.ebuild

index 388419db42c9aa510309b65e6271604095be9195..17dfbf8671e98e90470b08e4c369591ca5e94c9a 100644 (file)
@@ -1,6 +1,11 @@
 # 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.54 2007/04/17 22:17:56 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.55 2007/04/18 11:58:31 jokey Exp $
+
+  18 Apr 2007; Markus Ullmann <jokey@gentoo.org> -wireshark-0.99.4.ebuild,
+  -wireshark-0.99.4-r1.ebuild, wireshark-0.99.5.ebuild:
+  Fix gcc 3.4 bug #165340 thanks to Guenther Brunthaler for the solution, do
+  some cleanup as well
 
   17 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   wireshark-0.99.5.ebuild:
index 99cc91a2f84b29ee7fb971b6b42944507999eca9..7620d167c57fed8fa43c2a051735b28073874d40 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX wireshark-0.99.5-sizet.patch 290 RMD160 f162ca06aab5b3f62269c3690bef965c1eceef95 SHA1 3afbd56f4dbcccda7e74cda158553786f88fd7f4 SHA256 9081276cb7e8ba74e4f9289e89f3e0bced9e1163b4e7e5cefb3cf7b131605375
 MD5 9cf68b2290e19ac343fdc91bbff3620f files/wireshark-0.99.5-sizet.patch 290
 RMD160 f162ca06aab5b3f62269c3690bef965c1eceef95 files/wireshark-0.99.5-sizet.patch 290
@@ -13,41 +10,19 @@ AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a
 MD5 555b2ee8663c2a28c7ed7423ea9b2299 files/wireshark-except-double-free.diff 664
 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 files/wireshark-except-double-free.diff 664
 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369 files/wireshark-except-double-free.diff 664
-DIST wireshark-0.99.4.tar.bz2 10472441 RMD160 6bf940af951ddfcf66157a8cb299e6342dd3f955 SHA1 696216d794b418da3cb0a1829281ef65bf3e64ff SHA256 a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e
 DIST wireshark-0.99.5.tar.bz2 11007039 RMD160 1b3f7bb8e2c73a945fff86fb8ab2aa79481ba809 SHA1 ec9a07f13d5cda3d310d8c8900362f7cb96f4042 SHA256 9801c0c974a646606c56935dfd1aa503c9b007c76a3f1709f69ba038daf5860e
-EBUILD wireshark-0.99.4-r1.ebuild 4350 RMD160 f54e6b4ae3c8e203e5e25439a02557e4adc97edd SHA1 d4eff8e461f99665096fefdf562d46cf1fec4b06 SHA256 1b885d62eafda6eca6446660b7ba0a21a26914722cda8bf62999095b87b13ff8
-MD5 b98de57623b82fdbf047f45ff3884076 wireshark-0.99.4-r1.ebuild 4350
-RMD160 f54e6b4ae3c8e203e5e25439a02557e4adc97edd wireshark-0.99.4-r1.ebuild 4350
-SHA256 1b885d62eafda6eca6446660b7ba0a21a26914722cda8bf62999095b87b13ff8 wireshark-0.99.4-r1.ebuild 4350
-EBUILD wireshark-0.99.4.ebuild 4237 RMD160 9250e63075ba1723017f9ad250a323ee363c64f1 SHA1 a22a707e4dd3f70baa1a7ff4bebebff80a14165d SHA256 773e31cf497b1225a207f8a0c82604832a6b72db7440ee7513bfa29524df8dd1
-MD5 b6a61f095d0d650e57948a38bd53ff21 wireshark-0.99.4.ebuild 4237
-RMD160 9250e63075ba1723017f9ad250a323ee363c64f1 wireshark-0.99.4.ebuild 4237
-SHA256 773e31cf497b1225a207f8a0c82604832a6b72db7440ee7513bfa29524df8dd1 wireshark-0.99.4.ebuild 4237
-EBUILD wireshark-0.99.5.ebuild 4445 RMD160 a1b50788982f04f12d88a12253ef6401243d69ee SHA1 764e141617a7d11fd17692030d976a9bab80d244 SHA256 d1459dcdf84a08c5b4e929a93c79d0db0b09840dbbcd9c0bad663a8cab4bfd4b
-MD5 1ce0993a53a9eab3871084e1ccb49bbf wireshark-0.99.5.ebuild 4445
-RMD160 a1b50788982f04f12d88a12253ef6401243d69ee wireshark-0.99.5.ebuild 4445
-SHA256 d1459dcdf84a08c5b4e929a93c79d0db0b09840dbbcd9c0bad663a8cab4bfd4b wireshark-0.99.5.ebuild 4445
-MISC ChangeLog 7652 RMD160 cdcb35810fadaff6d063f0a67e5b0509041a6bad SHA1 69100564d20ca97a508361baf6da0904d30473bb SHA256 440702627dda70a27cf92be2f4c9880dd59e330ed4ad34ade99f9e6b0129cdc4
-MD5 5ef5b68c2338a4654bc5c508639cad7f ChangeLog 7652
-RMD160 cdcb35810fadaff6d063f0a67e5b0509041a6bad ChangeLog 7652
-SHA256 440702627dda70a27cf92be2f4c9880dd59e330ed4ad34ade99f9e6b0129cdc4 ChangeLog 7652
+EBUILD wireshark-0.99.5.ebuild 4454 RMD160 ced1aed25d5ee385f27e750195078b5b643fefd8 SHA1 6376454189e83f51a6acd761cec16f6a73617c28 SHA256 a2a678dcc39cb3f0cc0556ec18c90e71151dcdde7a47082ebcd0c8209fd56994
+MD5 85cf7bd6d7d47ca660e41d71703eb2f3 wireshark-0.99.5.ebuild 4454
+RMD160 ced1aed25d5ee385f27e750195078b5b643fefd8 wireshark-0.99.5.ebuild 4454
+SHA256 a2a678dcc39cb3f0cc0556ec18c90e71151dcdde7a47082ebcd0c8209fd56994 wireshark-0.99.5.ebuild 4454
+MISC ChangeLog 7881 RMD160 72bed5a2d6bd7bd41554431c51eec8e69ba2463d SHA1 f077e606d6e1681043b04c152fc9cf10e4423f4b SHA256 fe8a6b04fd6bfb3203a3241ddd47ed2f7343be5f6778a82330bce15730751917
+MD5 e58ba6ef114f08f84bcaf5a5597e556a ChangeLog 7881
+RMD160 72bed5a2d6bd7bd41554431c51eec8e69ba2463d ChangeLog 7881
+SHA256 fe8a6b04fd6bfb3203a3241ddd47ed2f7343be5f6778a82330bce15730751917 ChangeLog 7881
 MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02 metadata.xml 241
-MD5 68b73f14cc8b3dc15a7c636b7d25e1e4 files/digest-wireshark-0.99.4 259
-RMD160 4f00e810f399b65484275319dfb76055bc71f8ef files/digest-wireshark-0.99.4 259
-SHA256 85ae4fb2135d27ce392f55dc72be383af5985b30a8594268e4065b569a570e4d files/digest-wireshark-0.99.4 259
-MD5 68b73f14cc8b3dc15a7c636b7d25e1e4 files/digest-wireshark-0.99.4-r1 259
-RMD160 4f00e810f399b65484275319dfb76055bc71f8ef files/digest-wireshark-0.99.4-r1 259
-SHA256 85ae4fb2135d27ce392f55dc72be383af5985b30a8594268e4065b569a570e4d files/digest-wireshark-0.99.4-r1 259
 MD5 8c4800c83cacdb6bdaba3dfce8ff2bd2 files/digest-wireshark-0.99.5 259
 RMD160 f10ce49cc68b01414423bb6d5a566088d659f4d9 files/digest-wireshark-0.99.5 259
 SHA256 10ade9a82e7e0d50bed6dac4edce4fccc71c249dc01d40586abc7b94e135bd68 files/digest-wireshark-0.99.5 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFGJUeeKRy60XGEcJIRAg2rAJ9HM1Izs9RW9g2eEtULzl5AazNDzwCfRUgc
-Pz4HvTECHGh4Z6joBRjJU84=
-=8as1
------END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.4 b/net-analyzer/wireshark/files/digest-wireshark-0.99.4
deleted file mode 100644 (file)
index 361cdfc..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 05fada181e12bfa94b52f0b10395b28c wireshark-0.99.4.tar.bz2 10472441
-RMD160 6bf940af951ddfcf66157a8cb299e6342dd3f955 wireshark-0.99.4.tar.bz2 10472441
-SHA256 a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e wireshark-0.99.4.tar.bz2 10472441
diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.4-r1 b/net-analyzer/wireshark/files/digest-wireshark-0.99.4-r1
deleted file mode 100644 (file)
index 361cdfc..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 05fada181e12bfa94b52f0b10395b28c wireshark-0.99.4.tar.bz2 10472441
-RMD160 6bf940af951ddfcf66157a8cb299e6342dd3f955 wireshark-0.99.4.tar.bz2 10472441
-SHA256 a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e wireshark-0.99.4.tar.bz2 10472441
diff --git a/net-analyzer/wireshark/wireshark-0.99.4-r1.ebuild b/net-analyzer/wireshark/wireshark-0.99.4-r1.ebuild
deleted file mode 100644 (file)
index cea7a22..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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.4-r1.ebuild,v 1.3 2007/02/24 11:33:43 dragonheart Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-#SRC_URI="http://www.wireshark.org/download/src/${MY_P}.tar.bz2"
-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-1.1.4
-       snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-       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-0.9.6e )
-       !ssl? ( net-libs/gnutls )
-       net-libs/libpcap
-       >=dev-libs/libpcre-4.2
-       adns? ( net-libs/adns )
-       kerberos? ( virtual/krb5 )
-       portaudio? ( media-libs/portaudio )
-       selinux? ( sec-policy/selinux-wireshark )"
-# lua fails with version 5.0 and 5.1 is not in portage yet - 2006-04-25        
-#      lua? ( >=dev-lang/lua-5.1 )"
-
-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
-}
-
-src_compile() {
-       replace-flags -O? -O
-       filter-flags -fstack-protector # see bug #133092
-
-       local myconf
-
-       if use gtk; then
-               einfo "Building with gtk support"
-       else
-               einfo "Building without gtk support"
-               myconf="${myconf} --disable-wireshark"
-               # 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."
-}
-
diff --git a/net-analyzer/wireshark/wireshark-0.99.4.ebuild b/net-analyzer/wireshark/wireshark-0.99.4.ebuild
deleted file mode 100644 (file)
index e1ac730..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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.4.ebuild,v 1.11 2007/02/24 11:33:43 dragonheart Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-#SRC_URI="http://www.wireshark.org/download/src/${MY_P}.tar.bz2"
-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-1.1.4
-       snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-       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-0.9.6e )
-       !ssl? ( net-libs/gnutls )
-       net-libs/libpcap
-       >=dev-libs/libpcre-4.2
-       adns? ( net-libs/adns )
-       kerberos? ( virtual/krb5 )
-       portaudio? ( media-libs/portaudio )
-       selinux? ( sec-policy/selinux-wireshark )"
-# lua fails with version 5.0 and 5.1 is not in portage yet - 2006-04-25        
-#      lua? ( >=dev-lang/lua-5.1 )"
-
-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_compile() {
-       replace-flags -O? -O
-       filter-flags -fstack-protector # see bug #133092
-
-       local myconf
-
-       if use gtk; then
-               einfo "Building with gtk support"
-       else
-               einfo "Building without gtk support"
-               myconf="${myconf} --disable-wireshark"
-               # 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."
-}
-
index 64a332f917b4d55ba01e5320893bb25a2a7fd602..8c19f9ba0cb706e978815bc303b7356bf7b0295c 100644 (file)
@@ -1,36 +1,33 @@
 # 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.5.ebuild,v 1.11 2007/04/17 22:17:56 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.5.ebuild,v 1.12 2007/04/18 11:58:31 jokey Exp $
 
-inherit libtool flag-o-matic eutils
+inherit libtool flag-o-matic eutils toolchain-funcs
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
-#SRC_URI="http://www.wireshark.org/download/src/${MY_P}.tar.bz2"
 SRC_URI="mirror://sourceforge/wireshark/${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 gtk ipv6 portaudio snmp ssl kerberos threads selinux"
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-       snmp? ( >=net-analyzer/net-snmp-5.1.1 )
+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-0.9.6e )
+       ssl? ( dev-libs/openssl )
        !ssl? ( net-libs/gnutls )
        net-libs/libpcap
-       >=dev-libs/libpcre-4.2
+       dev-libs/libpcre
        adns? ( net-libs/adns )
        kerberos? ( virtual/krb5 )
        portaudio? ( media-libs/portaudio )
        selinux? ( sec-policy/selinux-wireshark )"
-# lua fails with version 5.0 and 5.1 is not in portage yet - 2006-04-25
-#      lua? ( >=dev-lang/lua-5.1 )"
 
 DEPEND="${RDEPEND}
        >=dev-util/pkgconfig-0.15.0
@@ -63,8 +60,17 @@ src_unpack() {
 }
 
 src_compile() {
-       replace-flags -O? -O
-       filter-flags -fstack-protector # see bug #133092
+       # 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
 
@@ -135,4 +141,3 @@ pkg_postinst() {
        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."
 }
-