Old.

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

3 files changed, 8 insertions, 264 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index ea0be0d5a6ab..3739dd73b09d 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.706 2015/03/30 10:02:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.707 2015/03/30 15:43:35 jer Exp $
+
+  30 Mar 2015; Jeroen Roovers <jer@gentoo.org> -wireshark-1.12.3.ebuild:
+  Old.
 
   30 Mar 2015; Agostino Sarubbo <ago@gentoo.org> wireshark-1.12.4.ebuild:
   Stable for alpha, wrt bug #542206
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 5aa7eb1e3c09..60ce102fc4d8 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.3.tar.bz2 29211228 SHA256 69950b9dcb1a630982b5f680554d73d27ee0dc856fc6aeef88c8d04eb5ac33ea SHA512 370ae828a638edac378242a996b0279747a2f54689387fe415f1f66e267a4b52c71a1a369755f3eaa6a2db0e970913dab0b5d3704af3461aa9d7d64abb3a49c6 WHIRLPOOL 4152abb29cc02236449844526207c404628c24a680e059cf8352a8ba8d50003dffca606fca8bf3a157b9970a1fba6943e0d06f51afaa847c4103ebbcbc4aeb44
 DIST wireshark-1.12.4.tar.bz2 29257016 SHA256 de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312 SHA512 ceeb6cb4489ce150a6065e586f83cfbcd0fd79cd05cf8ab5b0346baa03eaa5188503b18a1f228458447235d79f765c410e6b52b9aae77547f80b206429c77b24 WHIRLPOOL 31e3bce9d9003140f808b49e263727bb9386530a81a4ccd6e24cb6bc78f95cc5104da360be7edcd3a214de713b65931b4e77054cb1c3480d8e8c892fce57ed9a
 DIST wireshark-1.99.5.tar.bz2 29806267 SHA256 d2d5dd1367eb05037651daf7355888f5938d5ca45fcd730fe117605adf9e6c7c SHA512 5c951f189a0904c02897ee81101896215332c39f3ae3daaef92c923f020a6bd46b9158329add8d70e7ffbe06175252b8b477e4ca9bc86ae96b198bda20296235 WHIRLPOOL 2b70ea5df6b9c50bef6df9e05158ad8fd8ac106df1600eb51aa5b42002f05853d76ed446ac6f8b4cfad9e5899e1022f296830f6aadc23c41924ceb8f866c5321
-EBUILD wireshark-1.12.3.ebuild 6160 SHA256 15bfcb8012983ff5c18948554c4762eb0a75d9ae61e9cbb34ec489881423a7b3 SHA512 58b8805b3b4f02f9c6debfe479e159718c383d8518b5231fe9ef5c02c04b0b92703e33d776ffe7c37cbee035abfa5c41c9a3d7d4aae90a68e43c4da906e91ce1 WHIRLPOOL 40c5c8b0904dee397fc59a1cd5e3c42c3b64ed40381fe35128f2a1f8b9bba2166d2b2735df331ea71ec955655bf1b7b1a89f5d464ca95dd0a5ea9c4e9798bc60
 EBUILD wireshark-1.12.4.ebuild 6244 SHA256 15fb17318242f7ba556f65dbe5270eec1c710548db20ba58576d9e728e0eed27 SHA512 4c7b41e9dcc5707af3dff24a8c8f32320550ed43af18a3cf6b9deac0fc3a1d64301791c3a87a2cca3442a1b65d6594c8c1b1e98afcd1fc8ad11e1532d2bc3708 WHIRLPOOL 0c2494ebc41dbafbfdfe476a572285bd5cbe8e4eb85e3a6515b1b244a3952c042955b8792658ba144e1d33968d49ea0c8c6d8228c9e4fd03c3cfb09132ceca64
 EBUILD wireshark-1.99.5.ebuild 6321 SHA256 b65b511d6320a13b39e719e51e8bfc1bf7497476eb3b01fc29a79f0b5dfa14cd SHA512 ce4f83c53eda5669c126b1cfcca395c58840f0bb9659feb11fea73c5be0123d54a987e6476aa02e6e5aeb9baf8ead78f1b0ba6d3c3c6b098fa5918e1c034174d WHIRLPOOL 8feac2a37bad9c9a377ae5a09c8621d821eb53c63be8186dc554c07b6ab55a54389f8751c20a6af88463b9f1b9d8bafba5140a1163c4ab7083d910c8a0dfccf7
 EBUILD wireshark-99999999.ebuild 6367 SHA256 db1ac8fab15ba6182f9dcdedbe0fe3c73464cb2d3208f2c1be9fb5c54ab2f534 SHA512 188ec8f18e5afc909a259bba194449123f2472a534c10187e93a295b42e035e7e921b8e8e86deea1d807ad6d3c93865f67cc0c34471a24c8b03162d285b0d90f WHIRLPOOL 48b8af92694a899ddb1a4f574c510c170ad296c48b5288f7fc6c91dd9230dead021d9394f156550bb653f9b2a77559dff0965e788e3a721690339ae3de5f34b1
-MISC ChangeLog 102614 SHA256 102f29c70869400d5cf8aca80576423bd2570c36ebac6259e45d37819d8c3461 SHA512 abe84adab438fbb4c435ec58c45a89f0917fda1f647edd29c09b3fb96ace7badef745bcc06481345c13158ea928b28219e230b187e97042395358bb5d08ce7c7 WHIRLPOOL 64c6e0df5dd8a7c0757e79ee2a0430b336198c27cf6f132d69a99132306a18b52a13a662ad4f223c230ed4b4e3b06066f76391c3b8da29ce0e789bc2085a34ad
+MISC ChangeLog 102695 SHA256 2b02342df4d6632bf8e83ba4bb2b840604408e01544d8508aa17fd5c012dce58 SHA512 2b1ca86ec9c0b792a2204cbe8590e057adaebd445c22f85c2edfba749dddae04fe6eda94e7762e42a5312bf66955ee834d3421f59210bbb518d8c2b66ae553a7 WHIRLPOOL f688fde8950e5260dfbef1151d02b14191d480e03bba8f534cd36938da8ddcad2ac20999e3da8b0f22e920f28c2b0751c634c194d5ee1e7877e76c010c786481
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVGR9JAAoJELp701BxlEWfaI8P/RPkPNuIEQYBP1ds7YqoQyh2
-prWe++dz1CAt3xdYOo8ohyZ1sy3PdoXZif32yyHLnuaHI3RBmT6d+EaU5dOHY1H0
-RZ2ed2K3ScloMAhRFuOpvmt6mJjpvn/vBVOvdcgdAf4OFo6ljBkQBMAgOCKyTbtQ
-zCWLupYi1dlrkT0Irinu6BM2Bn65VUQSAD36z2KR89uu8j8QWDAQmVpij2OBOep/
-wtRp7j3uA0ejZcpIMQPiw94CLGXnm+eWyMmluoINjO0UZocKWrvwVb0KY+iyMo8i
-GRIZtXNwwwI+3ygYECQayrByCOQujE+evnwSnGvIX4qk5RB+gLMuNb9gXvICsZ3I
-JMfMYx+J4DwMpZRNVKCn01JIf6upDVtjOyL1HeAuBaxmxxZLmCLqyfB23VgXDS4S
-1meOKBptPuNioms05NN2xQFaN+19Lt6q16b7UgHXpUU9Kgtjcx8OEyaJiYR6g+JN
-rdTdFdOOUO0Gf1CnAHbT6JTXsfrUem6zbJV8FPmOSbTyOyG/vA+yf+hhxhLW/0jT
-SamyrWnvzfeC+4symoofjG1+kCDhb4skHD3a/Ob2h7B97w0qgFQ8AiWb69ji1ia4
-rRz7iMNUqcW3QVKyykTkiVq09e/xA/Y+2mkPHjJEsHMUZgGSD4UMEpCf7gnR3dCY
-u6cgFeM7FsH2p1uDR3be
-=0rF9
+iEYEAREIAAYFAlUZbygACgkQVWmRsqeSphOVbACfRh/1PLS9PitzJ7VJtmnGnh2a
+XTkAnAv4wKChBPYZgGc+3YJO0spySAw6
+=zU/Y
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.12.3.ebuild b/net-analyzer/wireshark/wireshark-1.12.3.ebuild
deleted file mode 100644
index ff5fc945da7e..000000000000
--- a/net-analyzer/wireshark/wireshark-1.12.3.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.3.ebuild,v 1.10 2015/01/16 08:07:55 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 sbc selinux smi ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-GTK_COMMON_DEPEND="
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-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
-	)
-	sbc? ( media-libs/sbc )
-	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}
-	gtk3? ( virtual/freedesktop-icon-theme )
-	qt4? ( virtual/freedesktop-icon-theme )
-	qt5? ( virtual/freedesktop-icon-theme )
-	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 \
-		"${FILESDIR}"/${PN}-1.99.1-sbc.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 sbc) \
-		$(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."
-}