Version bump (bug #484582).

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

4 files changed, 236 insertions, 21 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index c4496e151e79..b758f58588b8 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,13 @@
 # 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.537 2013/09/05 18:58:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.538 2013/09/11 16:23:10 jer Exp $
+
+*wireshark-1.10.2 (11 Sep 2013)
+*wireshark-1.8.10 (11 Sep 2013)
+
+  11 Sep 2013; Jeroen Roovers <jer@gentoo.org> +wireshark-1.8.10.ebuild,
+  -wireshark-1.10.1-r1.ebuild, +wireshark-1.10.2.ebuild:
+  Version bump (bug #484582).
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> wireshark-1.8.9.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index cb66768d65fb..32e145bfc74c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,28 +6,19 @@ AUX wireshark-1.10.1-pod.patch 305 SHA256 0153df4626adea8f04a37643a8beecfc37c139
 AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a53003e9fa47869f54c6f2f30d315720 SHA512 c4a2c66e6ea9b523ca9f5a3e37411221f5aa630de07d7bf84633855ac44da60b3b493671e578dbfd67de94e87ab1c79203f9b80b57f9460f2a81ee39f58171b3 WHIRLPOOL ca20e190c7a8d7ca69c6d90cfb28f8f1c8896b6793b9a026567ec4df4f7080ca6424ab249d01754db1059891d32362444178272489b4425e895f3031a0e1e0f7
 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.10.2.tar.bz2 26667284 SHA256 b7a83314424e13639c591de924aa240bc5f3d9cae01dde69bf858fa04b22a33d SHA512 fd2ad466b122e2044718d8b42d0b323293d2e7fe04af700a1e94d00c720f78ba664e9cdb9a7fb35a13a6f7d99d81e4345482ee8d98b7538972a3f23250a44702 WHIRLPOOL 41ca39120c7a3356bb221f1f2147d5dd278037c47c6613b8e8136e399455f04e16abfde7fd2561f95f4618afd5e9c341c1aff448f160624e6ae4f20f00e2c8d7
+DIST wireshark-1.8.10.tar.bz2 24125925 SHA256 27b67be9c8024c18899f1694698b01b589f3111f673f3e8da62cbe548cd2c242 SHA512 9ca4c320fd537e40a44ea5869217e0748c4cf9bf821a78bc46313621c8f43c5a4a0dd817cd2f919809c9136aefaa1bb7c8295f1cf0f24ddbfb4f7f61a9e996e7 WHIRLPOOL df6c8c5879e807eb8ecc3be6aa6868c57a845a1f68c6afdc2eb2b967556889e88afb280fb66f1417f28dbc1a744b969ac62cdc498b8296bf678c3c37cdb6ad6e
 DIST wireshark-1.8.9.tar.bz2 24287215 SHA256 0addfba198111e8120ec529cfb7d29232427e87efa0424d2b047d5f30d12c930 SHA512 4bab81eb75ed52fef084acbe3c693bd24cb96c30fccc795709bec29bcde0f24c6766fe10ca0361cca59367dbeeca8a509f28bca1bc0b9bc52440d959852ab471 WHIRLPOOL 2044b284d51674293c7a5753d9d1c5db9a18aa3a2bd8de861b7ed1b961ca0aa1879c20d682d32c74a13366a18b4def47ff7eafa7c359222536032b61a14b1927
-EBUILD wireshark-1.10.1-r1.ebuild 5707 SHA256 ffff930da1679b95bcd8e05e572b1a97be550872028596a1ae2089951643f078 SHA512 b867344c699b213e349ca880fb21fd5d38efa972f7945d82299ebd1080ea6f6bd16581c06d4db41209a74464358cbbbe926874b1a959891c0f5e909771743ae7 WHIRLPOOL db04428f6754be9c920da73268460f95e1dab1356764e6a23abdc44e0c65c521cf1c16f70dff03698e6f6080043291a81257da8865b00afc7ee96734b6a8550f
 EBUILD wireshark-1.10.1.ebuild 5711 SHA256 3d5c08b1cba3bb567d2c5eea7401d088f346058826c7637ee32d41b12cc69a55 SHA512 e0cf634c4cc470a030ef9167c8f1260802c8486f9dbc78df4261569f912188218012c7fa6a317780a87c700374d4582477aac3211c57d09692247d878de94134 WHIRLPOOL ebd5429fe7adc6521ad06bfedf918eec593a51949dd7e4d05f854ad7ed12a8fac5c2d760a710ae8d3e49de43f0902c35ce37f4fba9fa61b4cb3722b43bbe4487
+EBUILD wireshark-1.10.2.ebuild 5685 SHA256 846e935963bed4de7be0baabebc7b6597d07fb428736edc447b9c73c0f0b906d SHA512 16103b7d9a1c0cebe11bf74aad3d28e2e78f21adf051eefba9428ba2e0d90852a35308c47a705daf4e6b55dfd358498fc76957daffe9b34a3f7c0b8716842568 WHIRLPOOL a77c66eedb7e23ef4584c9c0c323aa0a19c3c2a632251178b6dc66b9128f1280f96666d3c68ae225fb900ed9c4b9cc970f5e0c58d41c8f96ed48698e56c10e22
+EBUILD wireshark-1.8.10.ebuild 5732 SHA256 a86c836c9fe1a3de1f2040cc51ad0b9e343a1434eb6371e6e2fc856a19afb79b SHA512 6a088fbdfaddf0c4df80725dfb2510e4e081762852763047497a58351608769f991eccc6a2ed8408b8a1b3c793858bd786d88c6e3873c83ad381322889a5fbc1 WHIRLPOOL 7ba63d2b8088d80e2deaa46ad04eba024c4f0da1ad644ba59affc0ec23b5f8024053bad842ae92874eeb1c8234a0bcbcc06e7c5aeb7866b0928333202f844af0
 EBUILD wireshark-1.8.9.ebuild 5705 SHA256 0261de0f872d82bffbb18b78ab7349bda5f75f120a4de720d9072cfdc66b3002 SHA512 8c92cbdfab67202710e474d197278e254adca3f2f25e19ac5ca36ba77108a6b974d362b74a672b671e779e49d6aaf8c64a95cc450be51fe725fb437819c493e9 WHIRLPOOL 8eee2bfabb7a6f64037cae43ec3ec311114ae8032f454b9a9fcb3cd9b6f6d96bcd957a7250030b668e11f947bf081c072c5efe38890a888a2c54c0c5c120d85c
-MISC ChangeLog 78343 SHA256 8b59deae9796115b8d70f2bd7f58ed71a15ed567d628768131a478bb7be6ccdb SHA512 a8038cb3c7dce557925c6f518fb608f31214586ea29dcd513f4e97ddd7643aa0b2e8649892a469318f06abe038f35d074705077afe2923a114edecdfc23acf0d WHIRLPOOL 5f9355e20b00bc3af71da403e626614f330b40396f92416b1c221452891ac31a3979a4155a605580660b7b6ee83c5452439cd7d70702e8b8be5088c507a188b9
+MISC ChangeLog 78566 SHA256 4f1c5e47cb0deb8d54f600da1c388ed651aa25396b387543f58743f9bc7021bf SHA512 959cb0c8db00e8e20629b4119f93a51e491dd3e5fa0b56fb972ed4405cd60b498e275b357616d0e09145c4ab152d31812db9a036d6ae434f0e69014847b1efb4 WHIRLPOOL b5c9cc2ab1be5978337b05da70da65133e96f466024916df71d3771f668d2c761a1eb0e81fecbd7244684f9768373781e8413273911cdfe1151482981ab78219
 MISC metadata.xml 2662 SHA256 aa3e958ce2704697a912374dfd9df72310353b54883e63de57b1f4e925f804eb SHA512 2eaf02dbd17d346b42dd2ecbb10318c08f8cba0e6bf0cd0dd76f145cc37c1eb35788c4a60d90c42b92c8b7e554315a40046b3b94c5d1a004ebb88650eb296dda WHIRLPOOL 21d6545372ed8aae96efb37f295904a3b14a721e754daf3bab74284d2e7527944fa6c75dc34c3229dea0c815641574f46f72b4b173d0653c6a92bf06341b81a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNSGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOo64P/AidNMmgZl4XEJmCOGC9n4ib
-AK/nXjJ5z8HwK61gPk4BEDH/hkcHrSRcdQRteuZLWeIzviZanO47VbrOb3o+LDxu
-O1BXLNwQDV43/pWoNlSAD3lqWMFVa6YB41n/OVovrx4kT3xiW/ostfg6bRyNdkY+
-p+oRIAhsCTzjPFOs/gbef9dOFlYzxhK4B4bSQVbcVA9YRYwMNIvgsjpDXV/Ho4JA
-66dvsx4fTIoiDo8tJHLk0xlcOs1d1BCY370USIT8hZNrQG9HniFGT3O2jD9WtPXs
-FxNnSPkCuLRQZe8ndTREkho3ab+eWMPfBom9qi5N7s8CT6dCjPVtlVVTFV2mKJAn
-fOIgmACRxUa/Fn1KUvq4lf9LXbOZynDrRQMVYgY/CW7ADdc70m0EBz2DtWepX1T8
-IkcndZ4UoJw6GMAjHFZFSCnhDqHCoTJjGbJuLju+s0BiEf/BlDIzlxDag/FUzJoO
-u1TO+n82ic9sZMa+9IknysM5MQ2ulgh1JnzdJ+2/A7j7AFVgXJdG9cpb385WPta6
-mgikaVs+AtF/v5CaY2YDg8rL0LyrR9Cwz0Gs37zriUrNBPJl04l6r1/gZRAZ1bMr
-z+SWYwsBI3AvmYFqt1CdLo/FTL1NHWUDx9EEeuIVYL27uUp2slHdgXfglYa3o72w
-GY8wprYfwu8jVxAdKREy
-=qrWw
+iEYEAREIAAYFAlIwmP8ACgkQVWmRsqeSphNfiQCcCnYCz5ckCDv+aJpZdO3BN2nD
+zGAAmwTTZweYijKzjL28mcjd44U9wnWr
+=YjsG
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild b/net-analyzer/wireshark/wireshark-1.10.2.ebuild
index 221817dd9dd7..c2ce82754521 100644
--- a/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.10.2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.5 2013/08/14 15:42:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.2.ebuild,v 1.1 2013/09/11 16:23:10 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps user
@@ -86,7 +86,6 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.10.1-pod.patch \
 		"${FILESDIR}"/${PN}-1.10.1-oldlibs.patch
 
 	eautoreconf
@@ -202,6 +201,8 @@ src_install() {
 	fi
 
 	use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
+
+	prune_libtool_files
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/wireshark/wireshark-1.8.10.ebuild b/net-analyzer/wireshark/wireshark-1.8.10.ebuild
new file mode 100644
index 000000000000..13f7121248cf
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.8.10.ebuild
@@ -0,0 +1,216 @@
+# 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.10.ebuild,v 1.1 2013/09/11 16:23:10 jer 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
+
+	prune_libtool_files
+}
+
+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."
+}