net-libs/libbtbb: update to support pre and port wireshark 2

Package-Manager: portage-2.2.27

diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 3d12be1e26fff6a227f50388573fcbeea2746a7d..f2001284c81d94d7a8219e8949591aa8200402d6 100644 (file)
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
        pcap? ( net-libs/libpcap )
        wireshark-plugins? (
                >=net-analyzer/wireshark-1.8.3-r1:=
-               !>net-analyzer/wireshark-1.98
        )
 "
 DEPEND="${RDEPEND}
@@ -56,7 +55,11 @@ src_prepare(){
                for i in ${plugins}
                do
                        sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
-                       CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+                       if has_version '>=net-analyzer/wireshark-2.0';  then
+                               CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+                       else
+                               CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+                       fi
                        BUILD_DIR="${WORKDIR}"/${i}_build
                        cmake-utils_src_prepare
                done
@@ -77,7 +80,11 @@ src_configure() {
        if use wireshark-plugins; then
                for i in ${plugins}
                do
-                       CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+                       if has_version '>=net-analyzer/wireshark-2.0';  then
+                               CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+                       else
+                               CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+                       fi
                        BUILD_DIR="${WORKDIR}"/${i}_build
                        local mycmakeargs=(
                        -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
@@ -95,7 +102,11 @@ src_compile(){
        if use wireshark-plugins; then
                for i in ${plugins}
                do
-                       CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+                       if has_version '>=net-analyzer/wireshark-2.0';  then
+                               CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+                       else
+                               CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+                       fi
                        BUILD_DIR="${WORKDIR}"/${i}_build
                        cmake-utils_src_compile
                done
@@ -110,7 +121,11 @@ src_test(){
        if use wireshark-plugins; then
                for i in ${plugins}
                do
-                       CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+                       if has_version '>=net-analyzer/wireshark-2.0';  then
+                               CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+                       else
+                               CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+                       fi
                        BUILD_DIR="${WORKDIR}"/${i}_build
                        cmake-utils_src_test
                done
@@ -125,7 +140,11 @@ src_install(){
        if use wireshark-plugins; then
                for i in ${plugins}
                do
-                       CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+                       if has_version '>=net-analyzer/wireshark-2.0';  then
+                               CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+                       else
+                               CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+                       fi
                        BUILD_DIR="${WORKDIR}"/${i}_build
                        cmake-utils_src_install
                done