summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/libbtbb')
-rw-r--r--net-libs/libbtbb/Manifest2
-rw-r--r--net-libs/libbtbb/libbtbb-2015.09.2.ebuild (renamed from net-libs/libbtbb/libbtbb-2014.02.4.ebuild)11
-rw-r--r--net-libs/libbtbb/libbtbb-9999.ebuild2
3 files changed, 9 insertions, 6 deletions
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 66ade0f2b863..a6cf8153f101 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1 +1 @@
-DIST libbtbb-2014-02-R4.tar.gz 165417 SHA256 6e79a2d8530596e34ad13fcce43dcf8b30b165d4629d5bf9c3eb7f8817980524 SHA512 9ab5ca45f9a88c78f8238c73eabbd04c69723e4ac9171551e3e073eff06acd5ad4197ea4f87036ae066aebb0d15705249899d2b7475e56bd224c83df6f0bd8d5 WHIRLPOOL 30fdc8948f5d1dd057887369f12a5660b1faabe14933ad876c00161fbd43dcebc80f512e370d4b8f56525a8bdcad057a4da8c545814276a65a691bb8e85383fb
+DIST libbtbb-2015-09-R2.tar.gz 222045 SHA256 35ce44636649163f0d9a4de5905f686470f54c79b408959760db8c8182853161 SHA512 e300ec09de34644a0cd2f4aba2fe0b03021aaa0b0fe5035022f1e698ff10867adfd84850d0d40e9c070fbd622efee1b614221c1f5b1818f1d4f5d58cc3f31919 WHIRLPOOL 99d8c621b263cd3cd82e423eabff21d4979b0407c31430aa26424d273c9e3ed802e68833e3a100588a46a9a2126a84d0be56e41c1b609ea2eed4a3d64203c995
diff --git a/net-libs/libbtbb/libbtbb-2014.02.4.ebuild b/net-libs/libbtbb/libbtbb-2015.09.2.ebuild
index 5ad431a258ac..3d12be1e26ff 100644
--- a/net-libs/libbtbb/libbtbb-2014.02.4.ebuild
+++ b/net-libs/libbtbb/libbtbb-2015.09.2.ebuild
@@ -26,8 +26,10 @@ SLOT="0/${PV}"
IUSE="+pcap +wireshark-plugins"
RDEPEND="
+ pcap? ( net-libs/libpcap )
wireshark-plugins? (
>=net-analyzer/wireshark-1.8.3-r1:=
+ !>net-analyzer/wireshark-1.98
)
"
DEPEND="${RDEPEND}
@@ -38,7 +40,7 @@ get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_};
which_plugins() {
if has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb"
+ plugins="btbb btbredr"
elif has_version '<net-analyzer/wireshark-1.12.0'; then
plugins="btbb btle btsm"
fi
@@ -65,9 +67,10 @@ src_configure() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
local mycmakeargs=(
- -DDISABLE_PYTHON=true
- -DPACKAGE_MANAGER=true
- $(cmake-utils_use pcap PCAPDUMP)
+ -DDISABLE_PYTHON=true
+ -DPACKAGE_MANAGER=true
+ $(cmake-utils_use pcap PCAPDUMP)
+ $(cmake-utils_use pcap USE_PCAP)
)
cmake-utils_src_configure
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 610eaabf1484..3d12be1e26ff 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -40,7 +40,7 @@ get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_};
which_plugins() {
if has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb"
+ plugins="btbb btbredr"
elif has_version '<net-analyzer/wireshark-1.12.0'; then
plugins="btbb btle btsm"
fi