Version bump. Remove old/unused.

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 8 insertions, 171 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index ff33df3187c8..392036dd820f 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.172 2009/05/27 15:35:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.173 2009/05/29 11:53:15 pva Exp $
+
+*wireshark-1.2.0_rc1 (29 May 2009)
+
+  29 May 2009; Peter Volkov <pva@gentoo.org> -wireshark-1.0.7.ebuild,
+  -wireshark-1.1.3.ebuild, +wireshark-1.2.0_rc1.ebuild:
+  Version bump. Remove old/unused.
 
   27 May 2009; Raúl Porcel <armin76@gentoo.org> wireshark-1.0.8.ebuild:
   alpha/ia64 stable wrt #271062
diff --git a/net-analyzer/wireshark/wireshark-1.0.7.ebuild b/net-analyzer/wireshark/wireshark-1.0.7.ebuild
deleted file mode 100644
index 39638ec29f46..000000000000
--- a/net-analyzer/wireshark/wireshark-1.0.7.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.7.ebuild,v 1.6 2009/05/04 16:24:10 pva Exp $
-
-EAPI=1
-WANT_AUTOMAKE="1.9"
-inherit autotools libtool flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-
-# _rc versions has different download location.
-[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && {
-SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz";
-S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \
-SRC_URI="http://www.wireshark.org/download/src/all-versions/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="adns gtk ipv6 lua portaudio gnutls gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=dev-libs/glib-2.0.4
-		=x11-libs/gtk+-2*
-		x11-libs/pango
-		dev-libs/atk )
-	!gtk? ( =dev-libs/glib-1.2* )
-	gnutls? ( net-libs/gnutls )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	pcre? ( dev-libs/libpcre )
-	caps? ( sys-libs/libcap )
-	adns? ( net-libs/adns )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.15.0
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	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
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark || die "Failed to create wireshark group"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.99.7-asneeded.patch"
-	epatch "${FILESDIR}/${PN}-0.99.8-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.0.5-text2pcap-protos.patch"
-	epatch "${FILESDIR}/wireshark-1.0-sigpipe.patch" #260457
-
-	cd "${S}/epan"
-	epatch "${FILESDIR}/wireshark-except-double-free.diff"
-
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	# optimization bug, see bug #165340, bug #40660
-	if [[ $(gcc-version) == 3.4 ]] ; then
-		elog "Found gcc 3.4, forcing -O3 into CFLAGS"
-		replace-flags -O? -O3
-	elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then
-		elog "Found <=gcc-3.3, forcing -O into CFLAGS"
-		replace-flags -O? -O
-	fi
-
-	# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
-	# our hardened toolchain bug
-	filter-flags -fstack-protector
-
-	# profile and -fomit-frame-pointer are incompatible, bug #215806
-	use profile && filter-flags -fomit-frame-pointer
-
-	local myconf
-	if use gtk; then
-		einfo "Building with gtk support"
-	else
-		einfo "Building without gtk support"
-		myconf="${myconf} --disable-wireshark"
-	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*) myconf="${myconf} --with-ssl" ;;
-		esac
-	fi
-
-	# dumpcap requires libcap, setuid-install requires dumpcap
-	econf $(use_enable gtk gtk2) \
-		$(use_enable profile profile-build) \
-		$(use_with gnutls) \
-		$(use_with gcrypt) \
-		$(use_enable gtk wireshark) \
-		$(use_enable ipv6) \
-		$(use_enable threads) \
-		$(use_with lua) \
-		$(use_with adns) \
-		$(use_with kerberos krb5) \
-		$(use_with smi libsmi) \
-		$(use_with pcap) \
-		$(use_with zlib) \
-		$(use_with pcre) \
-		$(use_with portaudio) \
-		$(use_with caps libcap) \
-		$(use_enable pcap setuid-install) \
-		--sysconfdir=/etc/wireshark \
-		${myconf}
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use pcap && fowners 0:wireshark /usr/bin/dumpcap
-	use pcap && fperms 6550 /usr/bin/dumpcap
-
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt
-
-	if use gtk ; then
-		insinto /usr/share/icons/hicolor/16x16/apps
-		newins image/hi16-app-wireshark.png wireshark.png
-		insinto /usr/share/icons/hicolor/32x32/apps
-		newins image/hi32-app-wireshark.png wireshark.png
-		insinto /usr/share/icons/hicolor/48x48/apps
-		newins image/hi48-app-wireshark.png wireshark.png
-		insinto /usr/share/applications
-		doins wireshark.desktop
-	fi
-}
-
-pkg_postinst() {
-	echo
-	ewarn "With version 0.99.7, all function calls that require elevated privileges"
-	ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE"
-	ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT."
-	ewarn
-	ewarn "NOTE: To run wireshark as normal user you have to add yourself into"
-	ewarn "wireshark group. This security measure ensures that only trusted"
-	ewarn "users allowed to sniff your traffic."
-	echo
-}
diff --git a/net-analyzer/wireshark/wireshark-1.1.3.ebuild b/net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild
index 40ed87ad831a..6b0ff84a494c 100644
--- a/net-analyzer/wireshark/wireshark-1.1.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.3.ebuild,v 1.2 2009/05/04 16:24:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild,v 1.1 2009/05/29 11:53:15 pva Exp $
 
 EAPI=2
 inherit autotools libtool flag-o-matic eutils toolchain-funcs
@@ -60,7 +60,6 @@ src_prepare() {
 
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.1.3-misc-warnings.patch"
 	eautoreconf
 }
 
@@ -146,10 +145,6 @@ src_install() {
 
 pkg_postinst() {
 	echo
-	ewarn "With version 0.99.7, all function calls that require elevated privileges"
-	ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE"
-	ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT."
-	ewarn
 	ewarn "NOTE: To run wireshark as normal user you have to add yourself into"
 	ewarn "wireshark group. This security measure ensures that only trusted"
 	ewarn "users allowed to sniff your traffic."