Old.

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

3 files changed, 8 insertions, 243 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 653484852a41..29e054a52351 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # 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.614 2014/05/17 13:50:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.615 2014/05/17 15:23:53 jer Exp $
+
+  17 May 2014; Jeroen Roovers <jer@gentoo.org> -wireshark-1.10.6.ebuild:
+  Old.
 
   17 May 2014; Agostino Sarubbo <ago@gentoo.org> wireshark-1.10.7.ebuild:
   Stable for alpha, wrt bug #508506
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 229d3cc93741..6887d67e26f2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,32 +7,20 @@ AUX wireshark-1.11.0-oldlibs.patch 776 SHA256 0b4b23ad3ce7022809187ce970733a4c6b
 AUX wireshark-1.11.3-gtk-deprecated-warnings.patch 1068 SHA256 0211d3f345617554add63f3101a548a990e26219b31b28003e4dbf607d38de88 SHA512 9ea643e8f707d9f9fe3ce61b875ae1828c77cd81c636423fc5572420fd3b103042e078f89541c5145db49f133828d333c55d1c2c3b9a162f0756051ef9d946b9 WHIRLPOOL b04cad3b70bc37b9cbc833227bdf9c32c17e67ad067902d3fb35f467fb76520546ecd508de1805ef810b76ebe4f0b686e483817c790cb4ede75c229505596502
 AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a53003e9fa47869f54c6f2f30d315720 SHA512 c4a2c66e6ea9b523ca9f5a3e37411221f5aa630de07d7bf84633855ac44da60b3b493671e578dbfd67de94e87ab1c79203f9b80b57f9460f2a81ee39f58171b3 WHIRLPOOL ca20e190c7a8d7ca69c6d90cfb28f8f1c8896b6793b9a026567ec4df4f7080ca6424ab249d01754db1059891d32362444178272489b4425e895f3031a0e1e0f7
 AUX wireshark-1.8.12-gtk-deprecated-warnings.patch 940 SHA256 9969d68caeb0277ef78b4fa2078aafe6ffb2452de68b17bea5882a1b474ccf00 SHA512 e4bb971475ed019d6231179213f6fc9641d0ea91bac89ae0871e351b4def31741c6d3a9e0ff45fbc741e82804d1db5b1ff3f902d9aa22f598292009716a2f3b0 WHIRLPOOL d482ee4e9c74867e01104a1f85804535e791350006ad90e64c51887904c389d684223c3de1569e0261372e7cb3fa186b0d9cdc75831246644761f170751fca73
-DIST wireshark-1.10.6.tar.bz2 26719003 SHA256 a9de3fd3002d4df0946cfea2f5a33557666e14c7014dbc42d1f78dfe113f6b5d SHA512 fc6a9416c34ba6bc1b4476723991d557ebd1302db9d26a0d39c77c850147aa52c4b31c32ca63c694c7fed71e5603c3b5737d7d2c7e3e6985f8c4e01110ca9d85 WHIRLPOOL e90989eaa41e8376ef7ab247470702eeb5d987b7e07f159466f150b475acf7a491b94b6f950020f41de5a77958a49269a48611aa1aa8355730ebc4f5a96524b7
 DIST wireshark-1.10.7.tar.bz2 26711577 SHA256 d98d263b31dd904a0337ba2db6d1a80bb495b4ac419a304f0f25c551d50cafc6 SHA512 2bc96e59a8fb2515ff557384f67a93dc0695bd9868b4b5ac340633dd0cae4970711f2eacf5f1fc63f47691b54d830059650c68680bd31478e29c83c7ebed8bc3 WHIRLPOOL b8ce841d460a231e071615577428db46ca8d30079963b18de6a7227180a3fcb9947cab98ecfcef24ea33c92f3ec9881576c0e28ff67af341c3cafc035f8a1fe0
 DIST wireshark-1.11.3.tar.bz2 28661638 SHA256 dfe8aa60581c9f7642503215a2dc1fe506a92aab20abcdf8520b9f8e12a83664 SHA512 675ff4c11392ebed2216870511b14eb7e4a35f6914a3511d285c126ce535ba7299f901ac2208febd8a721b95bef968b786e464ed4c459ab51957190653ca7dd9 WHIRLPOOL cd998a66cc643af9c522837de9b5a55f99d0f940e87f18fdec637c3066e988deeee4256ddbd886942222bc724453ae34e9a628474b062db2d336d08bb72e22ce
 DIST wireshark-1.8.13.tar.bz2 24150627 SHA256 0d672e549fa0b30bbde6f68e8f80ccae88017f2320e17df5ffd2507ecc9d6572 SHA512 b6b302a2f00c5ddf2e5ffbadbe2178959ed5b8a7843d8df176f96920a7095e847b513590d90543b4698264ee33c7504663f558a5cba18467301d8bd94a0673cc WHIRLPOOL 668e00974bb4ecb012ee833fc2c49361b464c5c593fbc2957252a95cec9e06efd13c211c76f58b56fdd3d4c99a95c9ca59f447892436eef2a32868f8e312be94
 DIST wireshark-1.8.14.tar.bz2 24158670 SHA256 bf25517861e07f57033e2ff4c1fd7b17738bdc1b2ec0e4893f2b58608c688139 SHA512 574834afe208d25f2b765132c37a8b7a72554ad504c62b96f402d93cb5b4c9146e1fe9ddb22637855d7579a30ac10e4bd846e95265618aa739e053bd2f3d0aa2 WHIRLPOOL 42217dc1e49c8c2e33f810fc85ce5f33c4e91ed89567e048304825f8f5efb3efbbde3f0f9f6f4d5b2650709ae50acc7b8f7bfce643b42ed326829abc68d77d6f
-EBUILD wireshark-1.10.6.ebuild 5816 SHA256 d67964dd4ff23eb22009a0b48f86c9d568f208bcbe3b1c3eff1ba17b1d23dcb6 SHA512 0cd6c7e5a68a1e81add7f7c51286db5c36ce2d12d5ab148e395513d4ad15ddd6827afbd24074760b8fbd539e809a0ee823753a75fb1b59736a1e360901a0bbad WHIRLPOOL 85afb702eb415c93fb4a1a9a3fff772da3b9b844087e1f0224dd6ffc008b9fac9ce081f285fdab7e10d5d3b97e593ef3d9f37f9e120c1dbc5ec4a731d1a259ef
 EBUILD wireshark-1.10.7.ebuild 5817 SHA256 2992523100d08e70150cf5c524e5e8a5803eb39fdbad98966007fc5db4508dfb SHA512 65e91fba21e1cd487ccfc97081b0a2cfd15e205270e62b58626801284fd42cb20ad3b2c7e064951877fabb0c433679fef4ee032d3a8581bcf91b417933612bdd WHIRLPOOL 12b5fbc9fdf13fb1c807aef04850bb9913c6205bb26d239f7a2058c190eb93ed59c20dc375f5478d04ea3142fcc9dde335b5f82466781afaf753dc257f4d5880
 EBUILD wireshark-1.11.3.ebuild 5531 SHA256 239fbeba69e23b43cd8d91735c12fd4ba1e1a45cafcf9cd5d31cac937984e3d3 SHA512 0cb8c035234facec9881ac65e982731386056e38433f1e63b5b113c23aa4acc6ff39bdc1543006e9020ceae672c5138167ed96d08957247a9f882a87263a72be WHIRLPOOL d3fe78052649db9f490ed749e0f2ef58e0a3c20e62a6065c3a73b571facd7742aada559362dbc714a881b2bbb362d34feb158c3b3897546c09b36c07a79878d9
 EBUILD wireshark-1.8.13.ebuild 5630 SHA256 63e31f4b1c0fd3e5c57fc025a834e8d70c6f9d846d161286eace0fa713a94b5d SHA512 2fde35910f12774058b1a2d79bf0a90ca8a1752616372242ae67c94bae71fc9708845f0dfbea90d6e3573075c72f125ec6790e5793ae9b365acf24b5c1b3d9f3 WHIRLPOOL afb5dc1d31aa94ce75f690c8ed8a6d3ca5597a4577b841f13fd5de597d7e6ef99caaa759e0ff0ee49f996d315c2a4a2f3276f7b14c43640e8ef0d3b66dad7e2c
 EBUILD wireshark-1.8.14.ebuild 5741 SHA256 67a13b7aa468ad056375fde431519629f028b1ac7c1762a91687d83068f509f3 SHA512 996c73a882c622044c5f72ad6e0f1fb80d439358cfd530130244267d49019489d27347e12ec92f5ff4be18960de90257e6f2317ad1fb1be2bd7d716839b54097 WHIRLPOOL a2266867e0f3f85001f0ccdef853ef2584589cfa04fba74033b1cc7420e5be5105928ae0f7ee7d7a7d56fdf79204c48af66a2ed3bd6385691bf247127e3b1eca
-MISC ChangeLog 89985 SHA256 b5e98cc29c479efb890e7e565d45aeda7e84d59e03cc5e0b17c8edcf3d2e9e0f SHA512 f9c401112410613438c527e3700a4ee27c7dc96bde0e1a4f47cd7ed625edc598b0f05a228c15f801ca0c04ae9ae0687fd80297f680b88ad09fe142c7572367aa WHIRLPOOL f7e7d9bf41e737b769fb9388b7445375afdabc57d989cb706ab64982c0aa96bba5093fe67dc28351c4b0d2f7819d4d494d17e4331b3733f4e8c4086aa28f4017
+MISC ChangeLog 90066 SHA256 4db8c3360e38303bd2ff6eb40082feb19cd0349bd9267c97ad911610927d051f SHA512 d3078c0b5b9634d62bdb28c94bfcc133fe8c9608b79501b81a479216fb4453f89cdd34eb46287c1abc26813932651ee048596edd8040097618922b7d3298b213 WHIRLPOOL 7d812acbec3a1d7e87524b0e4dc78a0d7ca7deaa36e15738fca34cde04069d1e1e30f2df8ec3297a5880df1a97f2f863f8ee6602ec1ffd5db8e28d9d00ca4814
 MISC metadata.xml 2662 SHA256 aa3e958ce2704697a912374dfd9df72310353b54883e63de57b1f4e925f804eb SHA512 2eaf02dbd17d346b42dd2ecbb10318c08f8cba0e6bf0cd0dd76f145cc37c1eb35788c4a60d90c42b92c8b7e554315a40046b3b94c5d1a004ebb88650eb296dda WHIRLPOOL 21d6545372ed8aae96efb37f295904a3b14a721e754daf3bab74284d2e7527944fa6c75dc34c3229dea0c815641574f46f72b4b173d0653c6a92bf06341b81a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTd2kLAAoJELp701BxlEWfN3EP/1b7cfo1z2OHaGKkWnKauE+b
-PCQe2e6KoUYSptpbtUV6anlJkEBGZd+RkbZ2qAau/0U/rooOqYsUXn8J1IegZMkE
-aJoisV/gPZkzJFgBviFF6CXZwhlqnTVKA8U4UBX1Dm9azdrG3bxLm6L4JraUIyD4
-n6CDiNG3/zeVTnzxf69iTTvrfsl2r3cQIAZPxZJvfhnG266SrRfXPe4x6/hSVZui
-NwpPSNOVc6mHx6CoyjM7Y4VBmXxZX/E+Iizoq4pGMlD9hn6levfRxFcUSIymBLop
-BWzfbnfOKBfD8SerP4zu+JpAs5WVkJ3v7jg7jaQQGaU20kvSyhgWGDxYao3XnXqr
-jxSRmOvLJB5xCdUnFCBAXtLRDfQFv/ys+nnJJqn8s5j6/FamaSn74QSEszfY+Rtg
-W3Wkn+WpvipRtQJ+tSFm+LasKFNgrub+o9qyArh+19SIxsi2rkUQiTwrqlASXgUp
-/QtM1G1lUr+LEGySwPEkQ4GxSBz9Rq6XuAuJTYN3FltPaIc2vDuDfzToeIyn9Y77
-3V6XRshugOgZlfxVgjNrW2iwD2kQgJd36NbQGb2RLJNIe3ulLcsUBZausxjbBQkp
-S9pTFMNtLWzA8ev/Lsq1FN6Pb0o6+1YaCxHIhT4XgCEIOL7pH2PaOaoBTo/3FMJL
-unFCrLTsyfO/CCMVAQZF
-=NHqv
+iEYEAREIAAYFAlN3fwoACgkQVWmRsqeSphMdNwCeIiZ79ExqU9ewTsq9OEHWigoL
+vzMAniSc5YyC64L7Gp6sw9KqK5KRInuV
+=1QQn
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.10.6.ebuild b/net-analyzer/wireshark/wireshark-1.10.6.ebuild
deleted file mode 100644
index b07eb99f13ae..000000000000
--- a/net-analyzer/wireshark/wireshark-1.10.6.ebuild
+++ /dev/null
@@ -1,226 +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.10.6.ebuild,v 1.9 2014/03/24 14:33:40 ago 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="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-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 qt4 )
-	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() {
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.10.1-oldlibs.patch \
-		"${FILESDIR}"/${PN}-1.10.6-gtk-deprecated-warnings.patch
-
-	sed -i -e 's|SvnVersion|GitVersion|g' docbook/*.xml || die
-
-	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, setuid-install requires dumpcap
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use pcap && use_enable !caps setuid-install) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use_enable ipv6) \
-		$(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) \
-		$(usex gtk3 --with-gtk3=yes --with-gtk3=no) \
-		--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
-		domenu wireshark.desktop
-	fi
-
-	use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
-
-	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."
-}