[gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: metadata.xml ChangeLog wireshark-1.8.0.ebuild

[Jeroen Roovers (jer)]

jer         12/07/10 15:07:22

  Modified:             metadata.xml ChangeLog wireshark-1.8.0.ebuild
  Log:
  Revert the USE=btbb addition (bug #425652).
  
  (Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

Revision  Changes    Path
1.8                  net-analyzer/wireshark/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/metadata.xml?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/metadata.xml?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/metadata.xml?r1=1.7&r2=1.8

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml	9 Jul 2012 19:39:21 -0000	1.7
+++ metadata.xml	10 Jul 2012 15:07:22 -0000	1.8
@@ -35,11 +35,9 @@
 </longdescription>
 <use>
 <flag name='ares'>Use GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
-<flag name='btbb'>Use <pkg>net-libs/libbtbb</pkg> (and appropriate hardware) to sniff bluetooth baseband</flag>
 <flag name='doc-pdf'>Build documentation in pdf format (US and a4 paper sizes)</flag>
 <flag name='gcrypt'>Use GNU crypto library (<pkg>dev-libs/libgcrypt</pkg>) to decrypt ipsec traffic</flag>
 <flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
 <flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
-<flag name='third-party-plugins'>Build plugins from third party sources</flag>
 </use>
 </pkgmetadata>



1.359                net-analyzer/wireshark/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.359&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.359&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.358&r2=1.359

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- ChangeLog	9 Jul 2012 19:39:21 -0000	1.358
+++ ChangeLog	10 Jul 2012 15:07:22 -0000	1.359
@@ -1,6 +1,10 @@
 # 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.358 2012/07/09 19:39:21 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.359 2012/07/10 15:07:22 jer Exp $
+
+  10 Jul 2012; Jeroen Roovers <jer@g.o> wireshark-1.8.0.ebuild,
+  metadata.xml:
+  Revert the USE=btbb addition (bug #425652).
 
   09 Jul 2012; Rick Farina <zerochaos@g.o> metadata.xml,
   wireshark-1.8.0.ebuild:



1.7                  net-analyzer/wireshark/wireshark-1.8.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.0.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.0.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.0.ebuild?r1=1.6&r2=1.7

Index: wireshark-1.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.0.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wireshark-1.8.0.ebuild	9 Jul 2012 19:39:21 -0000	1.6
+++ wireshark-1.8.0.ebuild	10 Jul 2012 15:07:22 -0000	1.7
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.6 2012/07/09 19:39:21 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.0.ebuild,v 1.7 2012/07/10 15:07:22 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -14,10 +14,8 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adns ares btbb doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
-third-party-plugins profile +pcap portaudio python +caps selinux smi ssl zlib"
-
-REQUIRED_USE="btbb? ( third-party-plugins )"
+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
@@ -37,7 +35,6 @@
 	!ares? ( adns? ( net-libs/adns ) )
 	geoip? ( dev-libs/geoip )
 	lua? ( >=dev-lang/lua-5.1 )
-	btbb? ( >=net-libs/libbtbb-0.8-r1 )
 	selinux? ( sec-policy/selinux-wireshark )"
 
 DEPEND="${RDEPEND}
@@ -107,10 +104,6 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-underlinking.patch
-	if use btbb; then
-		cp -r "${EROOT}/usr/share/libbtbb/wireshark/." "${S}/" || die
-		epatch "${S}/plugins/btbb/wireshark-1.8-btbb.patch"
-	fi
 	eautoreconf
 }