Old.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 10 insertions, 263 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index ba24d25ef153..c4b8f822fde6 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # 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.530 2013/08/01 13:02:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.531 2013/08/01 13:10:00 jer Exp $
+
+  01 Aug 2013; Jeroen Roovers <jer@gentoo.org>
+  -files/wireshark-1.6.6-gtk-pcap.patch, -wireshark-1.8.8.ebuild:
+  Old.
 
   01 Aug 2013; Agostino Sarubbo <ago@gentoo.org> wireshark-1.10.1.ebuild,
   wireshark-1.8.9.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 392c23e38b74..df5603978d37 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,32 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX wireshark-1.10.1-pod.patch 305 SHA256 0153df4626adea8f04a37643a8beecfc37c1399584917f56373a57c8340c93ca SHA512 82f89ca736d2e68a66b38191b8c278dfebabf8281a848132ecb6f9b792b645037bad0ee8bd76cbc608095f23d95bbd65d7b952c0c20c1e5921814fd04dd3fe20 WHIRLPOOL 9dd645ed116e5c20dfbd0df7ebee85d3c1f6b76e0a9fa1bbc6d9b6300bd460e6d08fedd4169617ded91e35279a4b929aa784048b9b8abb59849bbd35bd2cea8f
 AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a53003e9fa47869f54c6f2f30d315720 SHA512 c4a2c66e6ea9b523ca9f5a3e37411221f5aa630de07d7bf84633855ac44da60b3b493671e578dbfd67de94e87ab1c79203f9b80b57f9460f2a81ee39f58171b3 WHIRLPOOL ca20e190c7a8d7ca69c6d90cfb28f8f1c8896b6793b9a026567ec4df4f7080ca6424ab249d01754db1059891d32362444178272489b4425e895f3031a0e1e0f7
-AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b5a11b819768b66a7c848c2c3c90d8a SHA512 0ed1bce8b57942de72ee0a8d78ef7cc345ffea512248fa65acd4e8386a5aa61dde14663090578c78f3eee88c7966e8d40aa6d3dce13146c2adf5ed8ded019253 WHIRLPOOL a45a3d04c9823eb149174fbbaaeb5437e525d77da962aa627509941da3119e87d4eef26cb06b1d3534356c4fd1d4bf31bc102dbf8b3f69994a19dba8d730d05f
 AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2feea59c8c709eb7065e0c4d9bf741967 SHA512 8c37c020e1addcff70f631b710a15de040eb7af5fa43c0faad6729a090be180fb9d52ebd10a3aac6ad6e49344f795d27e093b9e7e3f591c835a0883ad9066ee6 WHIRLPOOL 59646ef16e7042cbcfa827525cae0f0de7e8cd7f9ccc01324e73b91c1dfd454ca7f7156bc477bdd601bd908969d217c251a33d91d9f6b334b0737035b5d55b66
 DIST wireshark-1.10.1.tar.bz2 26815901 SHA256 06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc SHA512 ae80b4959bd224ce0458055fdb7e8bd5e2395da09b658e1b2a3136540cb2b7d283b10f636cd2f534dd20dc2fc65892e2be4acb65ffa6e259a0539a1f8ee74cbd WHIRLPOOL deb3e8fde197af1cc6991b886b789b02c99f967acb977da42309038f6cf4804e7a500f3727e8bd69a8af8e680510a81cbeb261fab9546219e452038e28c6a1b1
-DIST wireshark-1.8.8.tar.bz2 24273325 SHA256 4358bff34b685a210b7f99fe7d3c233d07a487bb76237efb834afdc44cf5ac38 SHA512 8dd08702e4e6442891b83d870f03332188a9a95da27592721f04baeedeb2d6f7f3fb80ba0eaa57f58d0d1cbea4229078b07b2b04351e50559ee05594bfa3f070 WHIRLPOOL f89c6dc9e5b898a633b11c7bcb0218a025440dee138e766c3eea64c67633e20817731502d1abbbfb551b2d634b17e81b2c84b29bc2731415ec4a1fe3f75169fa
 DIST wireshark-1.8.9.tar.bz2 24287215 SHA256 0addfba198111e8120ec529cfb7d29232427e87efa0424d2b047d5f30d12c930 SHA512 4bab81eb75ed52fef084acbe3c693bd24cb96c30fccc795709bec29bcde0f24c6766fe10ca0361cca59367dbeeca8a509f28bca1bc0b9bc52440d959852ab471 WHIRLPOOL 2044b284d51674293c7a5753d9d1c5db9a18aa3a2bd8de861b7ed1b961ca0aa1879c20d682d32c74a13366a18b4def47ff7eafa7c359222536032b61a14b1927
 EBUILD wireshark-1.10.1.ebuild 5704 SHA256 1d5300769903612168c2454ad44175115a1b301ee05452b0434de362084fd28b SHA512 8244ae48b29e4e3452a18d9ef88645fc4d740e6b59dc19fa83d69a4adaeadded1d7b982ebdc49045f8e95dcf6eadd82955c814f61bdc9e1d3c6230f93ffbe397 WHIRLPOOL 50a8c88ec12b1dfd942dd9d63f883ec142608e6b86e13c5d4d6558a96c6c01e65f8d0ca0dfc42e9cd1c78ea1f63ed233b0bd6d72371190b4553c13c94a1cdaf2
-EBUILD wireshark-1.8.8.ebuild 5758 SHA256 76302cc884c924a34ff7770c4760169f1ebeec188d627562216a0b54e8c60953 SHA512 46b83a5182d64c2de1821cff701f88d3f76bd6476b88aa46c31830d1f4844202c199653a13061c0c0010edb41e63ec6cc75de260556b5f2b3d193583436371d6 WHIRLPOOL 81b4c1c0025ba36ac3b39ced77852ef09f0f90773b749cbf42763ab4563d352d59fd59bb276ac2cc51ad485ff4f1c1abdbc84699c7cffb01c382af920150eb65
 EBUILD wireshark-1.8.9.ebuild 5711 SHA256 dcd8ca52a5398ad596803de88505842ee0b8fb185444c6a1a195a84b8696e31b SHA512 fb7e8c4146f4ba16ca648614c7f820783857c730f05c74c8a2227197ae3725b9b40456292beafe55fb869fce3583db2ff88211c7ec5f9cee3744720c97420aa8 WHIRLPOOL 78362e8ecb71921a0ea02b3d042fa4c243b73214205647eecbaca3f4f8df43cb79f774d253c38b3c8b101df6f2d944010d84e97201724b52dc5b0844a575562f
-MISC ChangeLog 77217 SHA256 8f57a430fb53e6991cddfe50fc60aece3c5eccd2f127bfca6b1239b02c123624 SHA512 cbf1b1600f39b71e587c5003d0a614e18b91833cb2c937fba735f1d75c2608711ad4fe41c55e5aeb09b763c73e94099fc0f25058ece7f982cd3a05e54ec7e77d WHIRLPOOL 3a4dd40435a694c2c421417d3d5b28bdf568aff70609fbcc9a77bb3da6dd6db5f2aa0361a2cc52e935a14476117d2cc926ae485e71f73d6d3610cca71ef19859
+MISC ChangeLog 77338 SHA256 9c85df882346081f36f49ca88dea484266042cccc17c526384fbcaaf77acd566 SHA512 8ec862025160f7341b44c7c27ce368ee7ab37e290a36f0d005bf8a961569e7702858f5254a91d6c225bd32d127b230672d12cd118895a3b0343506f35e489c63 WHIRLPOOL 294c192f66cf0986dc7b0bfa1173fd3cc912f1fb023579ef6344b4ddd13055f6c667c34bcd19e65f1f082996fec48a64ec958f290322ec1175dced33785801da
 MISC metadata.xml 2488 SHA256 f1247d59a4fb82a4ad4b238f718be5a9f38faac52bfc12014373ba53da4fdf90 SHA512 1ee1dd96feede5b96d93b92283d6b65625dfac96a1eab7302d464c4f11c16c968c53693c50accf8791160b3aa60cf4cf019fdc4132d55befb161565552f7e173 WHIRLPOOL 38aaa57ea5034ad85627cb08f577fd678da42b3a921c578a81f6490c40e7321a249c7e0e0c3d8b16de42a2656af785d05f2e924dd335c7b2e88c0edff8c63972
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR+lxmAAoJELp701BxlEWfAcIP+wYwhgNXLNElyHpjwjGgOqcj
-mFCJ9UnQdUmAf5hg1X+58msWFZ+Mk8Fy+VrSzBobJJxDAgf8X9F8QHV8hmWaQo2F
-iDhp1ddaryWUD1Fc+pfFaWumVhX8Oajr+vW9Tvm6vzgMkyO+bYhqSx53FmuUwih0
-WzHflRnq8lofyw0wp74D/ocwqIgRXRp2ydHuNqkGVLOv3WQ4fWI2P5I4T8LV+AE3
-NFCsaEXBRj1nj+lQ51zeVTBbgGik3LIEjYHFbJEX0BcJlkZk0flsTuvnBcSHrnDC
-OGfeL6NrpCblqxKr1CGOnd3S2yUmWs/SMBCQeiQbU1n+FkKSEpkhb2LtMS7GxsUC
-YyF/3zYriD2glhS9Y68+TuCwps19oCnbwzY34IJbpJWq+vZiaZdRUWetVmgpVTLO
-YnX9kSAN5cZ4EUQDcDChsDOZqI/V1DQcZCXLdgboKB/L4PrkFtpauYkHnLHjofJS
-0oINe2MIIuWU9F+vPOmojwygee/C69buP2F7CBNPkVfbnU92Wt4tB53w8CfVRBE4
-FIFtURofbrbEGwQjWTZGqx07f0QtOPsd0m2kU2X3fj7PUR1rMkWaRZ8F7UERioZq
-+O1KnW7uks7row+46tZ0IhadpeFOAHCyvDo1nqMmTocjWE30dbxTW4+ZUr6B+1Ie
-Ss5dckPmMnFpGLMigDm1
-=y9Ig
+iEYEAREIAAYFAlH6XikACgkQVWmRsqeSphMSIACfeq1hQ64knrAgfpXC1UiRVWEN
+lp8An3PvMIJJS4YeZlcMwYmGJw2+k7hh
+=Lh9Q
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.6.6-gtk-pcap.patch b/net-analyzer/wireshark/files/wireshark-1.6.6-gtk-pcap.patch
deleted file mode 100644
index 0727aa2f8ebe..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.6.6-gtk-pcap.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/gtk/main.c
-+++ b/gtk/main.c
-@@ -2834,7 +2834,9 @@
- 
-   color_filters_init();
-   decode_as_init();
-+#ifdef HAVE_LIBPCAP
-   capture_filter_init();
-+#endif
- 
-   /* the window can be sized only, if it's not already shown, so do it now! */
-   main_load_window_geometry(top_level);--- a/gtk/capture_dlg.c
-+++ b/gtk/capture_dlg.c
-@@ -371,6 +371,7 @@
- 
- /** Initialize background capture filter syntax checking
-  */
-+#ifdef HAVE_LIBPCAP                                                                                                                 
- void capture_filter_init(void) {
-   cfc_data.filter_text = NULL;
-   cfc_data.filter_te = NULL;
-@@ -383,6 +384,7 @@
-   g_thread_create(check_capture_filter_syntax, NULL, FALSE, NULL);
- #endif
- }
-+#endif
- 
- static void
- capture_filter_check_syntax_cb(GtkWidget *w _U_, gpointer user_data _U_)
-
diff --git a/net-analyzer/wireshark/wireshark-1.8.8.ebuild b/net-analyzer/wireshark/wireshark-1.8.8.ebuild
deleted file mode 100644
index 8c43991ec2ab..000000000000
--- a/net-analyzer/wireshark/wireshark-1.8.8.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.8.ebuild,v 1.10 2013/06/10 03:38:17 jer Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_5 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 \
-		"${FILESDIR}"/${PN}-1.8.3-gnutls3.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."
-}