Old.

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

3 files changed, 8 insertions, 259 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index e9c15fb82571..d0f8a5b352a6 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.690 2015/01/16 08:07:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.691 2015/01/16 14:45:03 jer Exp $
+
+  16 Jan 2015; Jeroen Roovers <jer@gentoo.org> -wireshark-1.12.2.ebuild:
+  Old.
 
   16 Jan 2015; Agostino Sarubbo <ago@gentoo.org> wireshark-1.12.3.ebuild:
   Stable for ia64, wrt bug #536034
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 838cbea84bca..d7b19b07de57 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,29 +8,17 @@ AUX wireshark-1.99.0-qt5.patch 2757 SHA256 79621949e1b0d99229e1a033b58f7a2c18cfb
 AUX wireshark-1.99.0.1975-gcc_option.patch 2939 SHA256 4d534da5b4a45f311a622108a0a4313d1581925a8cdf35d8429d5f46baab0963 SHA512 a48204408b05cd61ee9e1beb36dcb4d11b49bdb150c13fbdf490f9bb4a14fee3fc5113c501c03e294a944ae3fb36ad9d37a406eeb09ea87e02f2ce44ab6b6568 WHIRLPOOL 0c7d944840a93931fc95d5deb53e45b3e43e6129d9af51a9ac53c1a0f190b202c02b9abf89b04e863f3d803a52d91c5496cf357cb3e5bd244a49c0fa7c56e8b0
 AUX wireshark-1.99.0.1975-sse4_2.patch 555 SHA256 bef93463a257b6154cf55f85e7860b373264e2a89f212f6db773ad02f3a6bedf SHA512 5086b36ecf9b1dd3292011602c8824a572dc759a0e35049a39f0da8045a93738a8f2c2b4c053a0f1d999dc8cdb7bfec3b33f2780d8795135dd65984355485578 WHIRLPOOL 55301e3ff688fbe7df405d40dd8a6e942d1613ee0e4543f46fa83ac6f0688170753fe1cfc67bbe00b9bd7a46cf73513530cc746ee29ba7845e3a45d12ed07743
 AUX wireshark-1.99.1-sbc.patch 665 SHA256 c76afab0f03c59001df597948153bf76bbdc14da30a2de9e93831bed6dc6e898 SHA512 3e71c9ecfb07c96df8330b6a1fa959bde79bf7531f106b7f90acc59a82f3b1ec74ae1643b9b13cd6a642b25766996afa7083ac1daa2bada765134ae8846112a8 WHIRLPOOL 8b53a06ffa03579ed71a558cb475e05bb7152463123089cec80b3f00ae68bab02fcba2fa789471419175965be6af1604e8371b30b9dd04a5b967c995627a5517
-DIST wireshark-1.12.2.tar.bz2 29138867 SHA256 30ae16b408a592642ce3a84dd9877d24df7a6dae8da4847486965190039df292 SHA512 b46f50bc6f748df37c6e35b542b5e813b805d04605a3f8b8f7baf61095597ff6f7eacc25c1f15f1e115c75866489c30c2c3bd9b0be10fdf03fcaa3e9e62cec94 WHIRLPOOL 4b208e81c1680fbe9c4dcdb566b5f80f271cf96e14b1eac66ba95fd48578f34d954e13d12b748f4b8530ca03894fe588b36f944e4f07f17b57d5c4908bdd81a7
 DIST wireshark-1.12.3.tar.bz2 29211228 SHA256 69950b9dcb1a630982b5f680554d73d27ee0dc856fc6aeef88c8d04eb5ac33ea SHA512 370ae828a638edac378242a996b0279747a2f54689387fe415f1f66e267a4b52c71a1a369755f3eaa6a2db0e970913dab0b5d3704af3461aa9d7d64abb3a49c6 WHIRLPOOL 4152abb29cc02236449844526207c404628c24a680e059cf8352a8ba8d50003dffca606fca8bf3a157b9970a1fba6943e0d06f51afaa847c4103ebbcbc4aeb44
 DIST wireshark-1.99.1.tar.bz2 29981374 SHA256 59d9fdff72a64626c0bb68bcfb0002d1441a9d6cfe8ec0ec72d23c1d862a4b3f SHA512 055ba559da47441346bbfeb5192884701c8731ab33868b94f432fac02e3d2181f86b3e810d6ec9710297e3a75368a507472157389150cf9c3f79d21e283793d7 WHIRLPOOL 697a2e318f02ad7214e2fe1f8684f70bf2f7cd91fbc715d16f36a72fc9d8275e96da22de6c66ba16c7c9f509eb91fa48017593d929b6f0e1458ca78bb01423eb
-EBUILD wireshark-1.12.2.ebuild 5978 SHA256 aecd0a2d39acd3c8cb1272569f4f030dfbc6a520e80c66ccf818d1a2f2505e98 SHA512 c5d8be585e7fe67f3b6e88fef340d589d96ac70fa1686237ea593d2f61397b4360f0366271279be45bffb8c88ce100ca1e17f65aa1edc3231b6a31a7b88d0808 WHIRLPOOL e471778ccd0e54e2c39152966e28fb5d22940f79db9ac4cbfefbc802f83c7c4df18ecc1f13a6eeb10aa6305bef4076d33e3afc79c61824d54f09a3740c5623e3
 EBUILD wireshark-1.12.3.ebuild 6160 SHA256 15bfcb8012983ff5c18948554c4762eb0a75d9ae61e9cbb34ec489881423a7b3 SHA512 58b8805b3b4f02f9c6debfe479e159718c383d8518b5231fe9ef5c02c04b0b92703e33d776ffe7c37cbee035abfa5c41c9a3d7d4aae90a68e43c4da906e91ce1 WHIRLPOOL 40c5c8b0904dee397fc59a1cd5e3c42c3b64ed40381fe35128f2a1f8b9bba2166d2b2735df331ea71ec955655bf1b7b1a89f5d464ca95dd0a5ea9c4e9798bc60
 EBUILD wireshark-1.99.1.ebuild 6250 SHA256 a9988a51256e96d3682f5f0d847c2596b0d12bd9f5bf898280f2965e9ea7792f SHA512 048498347fd936e176abd5f40a5dcb686fa9edbcda413da76ad02a57ede6b3c018fd9a831b4f5b6aefcc2f692fe9bb0296edabd8b1566f6633e2b3113f22462c WHIRLPOOL 5381f8435daaabf8c9eaf66367ddd81c1d45036a576ce300520d3627d392a85b1086f6575d0653ed8c95b4c0b884155fb262b3c62dac08ed8f166048c597aa52
 EBUILD wireshark-99999999.ebuild 6296 SHA256 bce59f02eb584b18056bce59607a4a4dd288bb327623eaeb8dbe4581715bdfad SHA512 8fc0f029b38663ac4f439aebb476cebde3c777dfd3bea2e46e2afaa91e5207eb52b02d14045165155f3c9b86df5d6a029bd1de37d066a6191ee3b0a2c2213fd0 WHIRLPOOL ab01cc5630bb8d78fd9c1cc624d5e456ce388c743e20a37fe11c79d3a1af22a3a2e199105c6b03558bdb3f4e5312af43260073f4d9eb15c453e849f3cf247450
-MISC ChangeLog 100638 SHA256 8b2eeebe0268dcb62218e8e5685c166ddd6f2bbf7496b573781a1418d9607c2f SHA512 680db97a10879fef4b0ce2b20b94078c08ed838b6fd18fecea91782fbf2bc1e024023431ffe85f2445f9d20669fb982a0d717380e3ab23fe15d000f4a4f0a504 WHIRLPOOL 5cd0cf1efbd1d985977c604e84c4eaa61a59bdd6fad44de2e31da227cf8d92c8c3433b61f1e59799f94e4112bd0e0c813c42af9b043c521939628e80a6e83c11
+MISC ChangeLog 100719 SHA256 5c26547d12d760c3d5203f3cc3a66a6787657dfb7fb4bcd63b4785566be49441 SHA512 069799f633b3a43fff0760e780796be52e36840bc41e18a9eff6188a85353f3a0465cf3998b752c3ef6ceeb90a1f4dc76a385d1fde8ee07a1914ad4fc92e596d WHIRLPOOL 7322c7eec8105be6682893d6330c67bd7ef999930caba91b19043c9ceeb4ae3925f3bea912edcfa58fcdc8b4d8eefeb88daf88792df18383e84653331895deb9
 MISC metadata.xml 2551 SHA256 043959725e25c500c4f38597224b0fa0da62c4a2db3e34dd1a3947f199829cab SHA512 532d03e6258a65b5462b884b6cdb7cdb230914aa595258c05c2be6fd6a01c9ac859e87ed39542a3106764e9c66c166e400df86bbde453b225c577d514a67e676 WHIRLPOOL e7132f0ba9d29b227e0fa76315951d826a31b78cff3d01a488018e1a826820abe1a67cbdb561e6b5b1da469384e6923172032f9da21a03bbcee64b758915a2ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUuMbcAAoJELp701BxlEWfolwP/1S8C7LMeNSLbR+2bjOXkZ6k
-P1dpdIlhHKF9/92A4lkMUaOkayJ3JZtC3ihjkjHZUIIkIAnjdLURIdJ1d+fbSKew
-hZuSVHDyo65UjdX6CdfHPVuKQjZVufPgWQKflgly7zPWZVwkolA2cDxYVOheZbi6
-vc9tfo3fRPOJmJVx3oAmFfHiESxGUHHOkxHQb5BLkb4T6J9dgJ4ESBKzbzeLJNgk
-UX4veVH3KPSnyAYyCglYbMJ3aVNzBrDGWIyzR9hx7tD3m5FWDSA8ruhaBWcR+RSj
-1tb+bKLS8SW5wdJfJmNlFxSNNOm+fZTTNy2S2+SaSIL6GhbICIx0PmTe1oqFuAZd
-0SMMhhs7hY/ZGYp2onfcpGWcL48yiBK4Ymqs6gOaLw7uLYjHvhNgClASzXiq9X/X
-fxEf6GkK2Xf/yknTavn/QVdtl6Qq5UkHg8PApEED6S5CBF/+kABRxXhwLdYb+d35
-0Lt52Yi1sBz1ftby5QIZ3ZRTFvrITt6IfgDjftABtPWtee03vxwuOv3XaWmzGZ6n
-dfkKppF5r7qq420KTfu/Iw83wiyBfoUVVRw8zqzmiSW6CmSRpm2xGY9eS0MdXqbv
-H+mAr3LDzQbU2/DrZNYOTbYzW6F38jKzHJM7+XysuAOV0MTqZxRkDmSxgqKrUvc5
-QAKO50ikLBAw3PNXD7GP
-=HjT9
+iEYEAREIAAYFAlS5I/EACgkQVWmRsqeSphMPkACfZOQnisAUjbJ7a0bTyfbIgX0d
+qgcAn1vfTBgx4c4/VDhR7nAJYrp41/9H
+=CCfl
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.12.2.ebuild b/net-analyzer/wireshark/wireshark-1.12.2.ebuild
deleted file mode 100644
index 16997b46f388..000000000000
--- a/net-analyzer/wireshark/wireshark-1.12.2.ebuild
+++ /dev/null
@@ -1,242 +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.12.2.ebuild,v 1.10 2014/12/03 09:56:53 ago Exp $
-
-EAPI=5
-inherit autotools eutils fcaps multilib qt4-r2 user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${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 +gtk3 ipv6 kerberos lua +netlink +pcap
-	portaudio +qt4 qt5 selinux smi ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-GTK_COMMON_DEPEND="
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-misc/xdg-utils
-	virtual/freedesktop-icon-theme
-"
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	netlink? ( dev-libs/libnl:3 )
-	adns? ( >=net-dns/c-ares-1.5 )
-	crypt? ( dev-libs/libgcrypt:0 )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	gtk3? (
-		${GTK_COMMON_DEPEND}
-		x11-libs/gtk+:3
-	)
-	kerberos? ( virtual/krb5 )
-	lua? ( >=dev-lang/lua-5.1 )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4[accessibility]
-		x11-misc/xdg-utils
-		)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[accessibility]
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	smi? ( net-libs/libsmi )
-	ssl? ( net-libs/gnutls )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-# We need perl for `pod2html`.  The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-wireshark )
-"
-
-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.3-gtk-deprecated-warnings.patch \
-		"${FILESDIR}"/${PN}-1.99.0-qt5.patch
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# 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 gtk3 || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	use qt4 && export QT_MIN_VERSION=4.6.0
-	use qt5 && export QT_MIN_VERSION=5.3.0
-
-	# 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 adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk3) \
-		$(use_with kerberos krb5) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with qt4) \
-		$(use_with qt5) \
-		$(usex qt5 MOC=/usr/$(get_libdir)/qt5/bin/moc '') \
-		$(usex qt5 UIC=/usr/$(get_libdir)/qt5/bin/uic '') \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		--disable-profile-build \
-		--disable-usr-local \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		--without-adns \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-	if use doc; then
-		use doc-pdf && addpredict "/root/.java"
-		emake -j1 -C docbook
-	fi
-}
-
-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 \
-		color.h \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		register.h \
-		wiretap/*.h \
-		ws_symbol_export.h \
-		wsutil/*.h
-	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 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 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 capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}