Version bump.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 10 insertions, 254 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/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/"