Old.

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

5 files changed, 6 insertions, 453 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 5e818ca81f09..36662289dbf2 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.547 2013/09/14 10:35:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.548 2013/09/14 14:42:24 jer Exp $
+
+  14 Sep 2013; Jeroen Roovers <jer@gentoo.org> -wireshark-1.8.9.ebuild,
+  -wireshark-1.10.1.ebuild, -files/wireshark-1.8.3-gnutls3.patch,
+  -files/wireshark-1.10.1-pod.patch:
+  Old.
 
   14 Sep 2013; Agostino Sarubbo <ago@gentoo.org> wireshark-1.10.2.ebuild,
   wireshark-1.8.10.ebuild:
diff --git a/net-analyzer/wireshark/files/wireshark-1.10.1-pod.patch b/net-analyzer/wireshark/files/wireshark-1.10.1-pod.patch
deleted file mode 100644
index 082f5d0fa5a1..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.10.1-pod.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/reordercap.pod
-+++ b/doc/reordercap.pod
-@@ -40,6 +40,8 @@
- When the B<-n> option is used, B<reordercap> will not write out the output
- file if it finds that the input file is already in order.
- 
-+=back
-+
- =head1 SEE ALSO
- 
- pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1),
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.3-gnutls3.patch b/net-analyzer/wireshark/files/wireshark-1.8.3-gnutls3.patch
deleted file mode 100644
index 45250dcf58e0..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.8.3-gnutls3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -185,7 +185,7 @@
- 		  [use GnuTLS library @<:@default=yes@:>@]),
-   with_gnutls="$withval", with_gnutls="yes")
- if test "x$with_gnutls" = "xyes"; then
--  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3],
-+  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0],
-         [
-                 echo "GnuTLS found, enabling SSL decryption"
-                 AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library])
diff --git a/net-analyzer/wireshark/wireshark-1.10.1.ebuild b/net-analyzer/wireshark/wireshark-1.10.1.ebuild
deleted file mode 100644
index 48e70b2daa05..000000000000
--- a/net-analyzer/wireshark/wireshark-1.10.1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1.ebuild,v 1.11 2013/08/04 13:28:08 jer Exp $
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="
-	adns +caps crypt doc doc-pdf geoip +gtk ipv6 kerberos libadns lua
-	+netlink +pcap portaudio profile qt4 selinux smi ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	gtk? ( !qt4 )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	netlink? ( dev-libs/libnl )
-	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
-	crypt? ( dev-libs/libgcrypt )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		>=x11-libs/gtk+-2.4.0:2
-		x11-libs/gdk-pixbuf
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	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() {
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.10.1-pod.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# 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
-
-	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 gtk || 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, setuid-install requires dumpcap
-	econf \
-		$(use pcap && use_enable !caps setuid-install) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use_enable ipv6) \
-		$(use_enable profile profile-build) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(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-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 gtk || use qt4; 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
-	fi
-
-	use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
-}
-
-pkg_postinst() {
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-
-	if use pcap; then
-		fcaps -o 0 -g wireshark -m 4550 -M 0750 \
-			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.8.9.ebuild b/net-analyzer/wireshark/wireshark-1.8.9.ebuild
deleted file mode 100644
index fe93ecd5e028..000000000000
--- a/net-analyzer/wireshark/wireshark-1.8.9.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.9.ebuild,v 1.10 2013/09/05 18:58:48 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_6 python2_7 )
-inherit autotools eutils fcaps flag-o-matic python-single-r1 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="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="
-	adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua +pcap
-	portaudio profile python selinux smi ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-"
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
-	caps? ( sys-libs/libcap )
-	crypt? ( dev-libs/libgcrypt )
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		>=x11-libs/gtk+-2.4.0:2
-		dev-libs/atk
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	kerberos? ( virtual/krb5 )
-	libadns? ( net-libs/adns )
-	lua? ( <dev-lang/lua-5.2 )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	python? ( ${PYTHON_DEPS} )
-	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
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-	)
-	>=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() {
-	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-single-r1_pkg_setup
-	fi
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.6.13-ldflags.patch
-
-	sed -i -e '/^Icon/s|.png||g' ${PN}.desktop || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# 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
-
-	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
-
-	# 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 pcap && use_enable !caps setuid-install) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use_enable gtk wireshark) \
-		$(use_enable ipv6) \
-		$(use_enable profile profile-build) \
-		$(use_with crypt gcrypt) \
-		$(use_with caps libcap) \
-		$(use_with geoip) \
-		$(use_with kerberos krb5) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with python) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		--disable-extra-gcc-checks \
-		--disable-usr-local \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-	use doc && emake -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 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
-	fi
-
-	use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
-
-	if use python; then
-		python_optimize "${ED}"/usr/lib*/wireshark/python
-	fi
-}
-
-pkg_postinst() {
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-
-	if use pcap; then
-		fcaps -o 0 -g wireshark -m 4550 -M 0750 \
-			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."
-}