sorry, no sleep, reverting 1.8.1 bump until it's done right

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

3 files changed, 18 insertions, 234 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 532976f94fd2..9edef509c3cc 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.360 2012/07/25 15:41:37 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.361 2012/07/25 15:50:19 zerochaos Exp $
+
+  25 Jul 2012; Rick Farina <zerochaos@gentoo.org> -wireshark-1.8.1.ebuild:
+  sorry, no sleep, reverting 1.8.1 bump until it's done right
 
 *wireshark-1.8.1 (25 Jul 2012)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b44a84a33d20..065901637293 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,26 +5,24 @@ AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b
 AUX wireshark-1.8.0-underlinking.patch 239 SHA256 63a0ecdd4b45e048c6f8a3f25c0fe0b7a827df8e7dc2167cc3ad51ab94b8eae7 SHA512 df34235187efc9c423acd2b0f14d7ff569db090566abfa8f343a6826afb246f6dbacf84af9d4903f3f2656ed832f8329ae4037536d7be1f18db8e36b1fb4c1c6 WHIRLPOOL 3fda73b9fa6cd6e22201a20f0e4331a610ea13f53a8b352f89f27e89e1a2b4edc16bededa6677892ec65b53c78dbc53ce051082824ddd7e1d823f0001e33faed
 DIST wireshark-1.6.8.tar.bz2 21967111 SHA256 d4fbaffa4fd32543ed1d03b3097bf89a7d492e6d02e9bf8f8aa8a71281f3057f SHA512 1f2eae0b94632f0bc37dbab16afdba711e1b3c8b059390645c38523d114b2c2908ccd0c396fc0c3b89be8b6fb8a314fee7b1e16c57ce05e98bf88d923b55fc78 WHIRLPOOL b46571b9cf33d35158ef95c0df65fb4941ab2097d687ebc21501ca4f46bed176b91893adb910a884a16c1054d2be9cb52c68f4f552871a81c91c3618fec811f4
 DIST wireshark-1.8.0.tar.bz2 24425043 SHA256 4cb802f116bbdcfa71afbc842dbfacd8f96594f4b221cbb5616d5c17bc696a62 SHA512 bd2b476dda089d27aba73ae5d5974757ec0fd1f6047adecad9966366cacd6e0565a313be1f14f59e38011cd18331f7cf4aaca69228d9af1201866c5174bf41d4 WHIRLPOOL e1173052180ad8f5634395cbdf5fc57e0339870aedfe7173ea9af44cdf1ec4386cfb314f34c10a37c38aae0fa1808a2ae08d6ae5076d1c9b2d1cfdf319ab784f
-DIST wireshark-1.8.1.tar.bz2 24125571 SHA256 5966a3e23d34972eb35433ae8198fccf1945617f71b89c1af26dada9f342feb7 SHA512 fec2212ca6c0b50b84f0642160b4685c5aa9e06677b68fa1103dbbd7dd684bfdc00330b2444a8805169e9fc88866707cf2b0dee45207e7f91ac40f7bcefb6faa WHIRLPOOL 1343b68fd95cb55f6445e09f38cd1b8f9b93d5a05146ea8937609f9d97be4b1fb4a45ff68aaa1885fd753d889b81f31422b5a96517eb72fd72d29e24f90745b6
 EBUILD wireshark-1.6.8.ebuild 6453 SHA256 45983c22afd371ca12b7cfaaa7b8657bb2c661ecc78c7d639cd8f7067e73670d SHA512 ab98125603ada0828444414b8807760e4f5bf009547fe58110ba6cf3ff981df18bd34e7d17605ac11fdbd592a8ef9e0b5a1985775dbea11ea750b3aaedb9b6fe WHIRLPOOL 500f699b5f8d84c85cb2422745a95e2a47cdf7915cb030ea5d688a1cd2a772c9060b8058ee577eecfde2a9bfb4e2dcbe1c380fd113621cd9240e1db82d964110
 EBUILD wireshark-1.8.0.ebuild 6347 SHA256 faa7bd3a28c578960f14c3346be417a00e213f828990408e39ebbf246c9767ac SHA512 e5079835d7836de849506f6db836acfc55498344c312d8ee72ed5c55c139cbae01610e4ae1da0c734bfa3df19f2d048e76f5e99e5258667d80337e7f8bf3606f WHIRLPOOL 39f5cd4c512ecfc640cc7786b56b866adaa37005df0301a32fb50a3843c8db948b591f94f91373e8ebf5fe2f3575fa93ac23a28094e6a805b8c0894ef805c529
-EBUILD wireshark-1.8.1.ebuild 6353 SHA256 7b30c4eb9d99c39154d3753e376ba0401b3a0d2af2a41c92cf37fc7cb80ac6ef SHA512 fb182fde92867cd94508ed038bc084651b7564b5ea0460d2e6d5cd725f4f3186e88a49eabaaf565928e8b4ed00aba478ad77a6d5a9eb3458a90bed071e3973bb WHIRLPOOL 68bdbd61cb06a1a6c3c79936fc31491b0de198e15bbdd98710683b5d23b2c97056fdb09ceb21adee6536657834b541cd4ba9d18bc0cf5b9373ce2edf0925b606
-MISC ChangeLog 52102 SHA256 7ef0b020011adb62066b83623dbac7b2729358b745d4c1475088905e407b399e SHA512 b3c7d9ce4dbe79f42cf76c1bca67fd453d0ae1992ed79bbfd25909ecfb32de98b2660b42712238faf025fcbb30d20731f681f5e52f0c3ce0fccb62898252718c WHIRLPOOL b6059c50ae7945bb2fbab13d61104cf45214e1b86fd683294e09d14d50d1b63f609ea5c4a0786133673f814d75ff4d42f435ec3b009d1ccd701a9bea62f53f94
+MISC ChangeLog 52240 SHA256 660c869ef410b0f4a09e256d728e33a85b519a8d247d9043b069e33ef97ae646 SHA512 f2456d5f1312154b198ec174dd5f49ae3e3f064d0728d9e1d4279db1121b4c327b6fee2cb7c5a4430d5d82ac1ec272dc147fbaa9a61ade3074a35aa06371e188 WHIRLPOOL 0bf6defb402d3a2eb3dfa391256ba1c50f275fef7aad4fa75a6fbbd06be3b3a7e2ab32e0663c112ddbdc670c23f8672d6babfcf92dd88b9a8c7fe9b969a82b34
 MISC metadata.xml 2400 SHA256 76f9bbd8fe91ac408781d92cd721b859e0c28fb9b645d48b7455d98320df8f30 SHA512 53cead1f63742ea915183e0d9d44776651f365a973884cf52525b181613a0ca4c2905e73597c228b637b633fa5e05a0331f6f91ca3e9c86991178dec3045412f WHIRLPOOL 98c5773fe59eb96e4f34ef7fc3e0ced2af1f28fd69be635c8afc6a95becc80c8f1a099d49486f9931dd7b7aa5d46672b97dfdb4dd3d0352ed23f8a94bd02b0ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQEBQBAAoJEKXdFCfdEflKA+0P/0GbAA04xfRqAdlxgCtSPPEH
-AZart5m2xk3F5igzNy5GVu8PVxbnXbrt4efgw2J2RUkUQHf293t9qobjC+7oVk7B
-eHX6Um67GfRP6nyEKzmvQ7Xwv32QEbz8wV1rLCJCEJ6ZQZehsU8legS5ggp8bp13
-KxyeL5MxqAed7xmjVvT3zNExYFUHLiZ8RH751GAOhFxqiWzc3ulOa8ftZI27iIce
-HdBcUmJqvF62CYx11X/6c5JXLEyGNxYnoXXfHkkEqi9N+yG88cVpRdr9K7US/t8/
-FQuwlsx4kQJZtX9up7qMcHxLhHLSAeDHRyIxrJQqw2vyvB9LW1qnWOFdNLNokozJ
-WYyKmo8n+BMhhVS6vHX3WzkMiEhue5/Zwd68AcuiqnnSIuZ4BVekXZ4vnneQInQx
-wt3Xpzh8tVq3TrJiJ/84pQIfIel2DFXtiMtnU+9NSZNxnnSFVF5Ui+GupazxHtCE
-T2sxV3FMzi9b0HVE7rdzwr2QFicyOeC6GZkBak9o+kFo3fYlFFyR6UuE80Tn7QC5
-aGK5Gmvow66XtteXbE7NuTfdtJbitmrV5CfzV7d5f45NJG9cHIvQkpRL8YbEXVD1
-uy2oV/ppu9CnzVruAU5tjO2R2wrjVbKvH1+ZR8jo6yOFrn7UZY/9oXRL87f/ZdQ/
-h6sJnTAMp2GOPD/wael1
-=2TpH
+iQIcBAEBCgAGBQJQEBX/AAoJEKXdFCfdEflKhhcP/1vSJ/a3DXPslKiV6Fl2heyn
+wLkkRN8h79Cj/Fx0OKcl6bMA0CGKafSzgpO1ZrMGyU8jsNpOnieYFfjAzpFpqaz7
+dsvc20aZrnEgSyohu3X+gctJhxI53hOZaRfDkti4/xaOnJ+kqGKdjlWaFSVXvdpe
+0aKbkWBNIUL03bKx7hjtm/tmkL+dbaPpGu1S3iZJprDmca3SPOv2CnskpdtHASkz
+3HqSGzKIgUsIAKDMTIjf0AgwSYMXkpYdEbEnWCTIDsjlgQSdDxDbNQGIqYwFnTcy
+QtmDhS7d/8ygWnR9+726HE7rVlKEhMzbU2aeymJxBh2juv3u8C7ZzAVi0yMfuJAG
+XqeHPuLfUpGWJrG0styMTA2vajK+UMUS7nek+MNQ2gLKdd4w+C4BlTipdpg7UNk1
+laOvWAaz25TxMJtnmzEJYCASNOgRLPytOdCLU8qhWvsi5eEOnVC2EmCo05V6G2Hh
+gAXuJLaZQroznqZO4QssFNwIBewyB2eGekDD0mrkVQbpxFCT6ndB/+SqfMH+rubN
+a3OblxdAgaMHGe46Y8/328S+y3JIJDZnGDvH4QHqr+lOCs0yPRXpydnypxg3aCUX
+6QG8cFeXMiVm+NIs42ZjNBq+KZYSB+vtI+ZzQNfjgEICSyJNjGdd6dXhLyw1hZ35
+I2e8+ysxbvpZkLC3jkr+
+=eeXL
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.8.1.ebuild b/net-analyzer/wireshark/wireshark-1.8.1.ebuild
deleted file mode 100644
index 018834bec946..000000000000
--- a/net-analyzer/wireshark/wireshark-1.8.1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.1.ebuild,v 1.1 2012/07/25 15:41:37 zerochaos Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-inherit autotools eutils flag-o-matic python toolchain-funcs 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"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
-profile +pcap portaudio python +caps selinux smi ssl zlib"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-misc/xdg-utils )
-	ssl? ( <net-libs/gnutls-3 )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	ares? ( >=net-dns/c-ares-1.5 )
-	!ares? ( adns? ( net-libs/adns ) )
-	geoip? ( dev-libs/geoip )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt
-		dev-libs/libxml2
-		app-doc/doxygen
-		doc-pdf? ( dev-java/fop ) )
-	virtual/pkgconfig
-	dev-lang/perl
-	sys-devel/bison
-	sys-apps/sed
-	sys-devel/flex
-	!!<net-analyzer/wireshark-1.8.0"
-
-S=${WORKDIR}/${MY_P}
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have <FS>_FS_SECURITY enabled where <FS> is the filesystem"
-		ewarn "to store ${path} (e.g. EXT3_FS_SECURITY). For kernels version before"
-		ewarn "2.6.33_rc1 SECURITY_FILE_CAPABILITIES must be enabled as well."
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
-
-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_set_active_version 2
-		python_pkg_setup
-	fi
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if [[ $(gcc-major-version) -lt 3 ||
-		( $(gcc-major-version) -eq 3 &&
-			$(gcc-minor-version) -le 4 ) ]] ; then
-		die "Unsupported compiler version, please upgrade."
-	fi
-
-	if use ares && use adns; then
-		elog "You asked for both, ares and adns, but we can use only one of them."
-		elog "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
-		myconf="$(use_with ares c-ares) --without-adns"
-	else
-		myconf="$(use_with adns) $(use_with ares c-ares)"
-	fi
-
-	# 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
-
-	# 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_enable gtk wireshark) \
-		$(use_enable profile profile-build) \
-		$(use_with ssl gnutls) \
-		$(use_with gcrypt) \
-		$(use_enable ipv6) \
-		$(use_with lua) \
-		$(use_with kerberos krb5) \
-		$(use_with smi libsmi) \
-		$(use_with zlib) \
-		$(use_with geoip) \
-		$(use_with portaudio) \
-		$(use_with python) \
-		$(use_with caps libcap) \
-		$(use_with pcap) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use pcap && use_enable !caps setuid-install) \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		--disable-extra-gcc-checks \
-		${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*}
-
-	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
-}
-
-pkg_postinst() {
-	if use caps && use pcap; then
-		fcaps 0:wireshark 550 cap_net_raw,cap_net_admin "${EROOT}"/usr/bin/dumpcap
-	fi
-	echo
-	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."
-	echo
-}