From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-858788-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 57C8658973
for <garchives@archives.gentoo.org>; Fri, 22 Jan 2016 03:17:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C107121C021;
Fri, 22 Jan 2016 03:17:25 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 082A421C021
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jan 2016 03:17:24 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E8393340873
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jan 2016 03:17:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 182F3E5F
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jan 2016 03:17:21 +0000 (UTC)
From: "Richard Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" <zerochaos@gentoo.org>
Message-ID: <1453432037.543eb42f3aafad30ceb50598f7816a8cda945a34.zerochaos@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-libs/libbtbb/libbtbb-9999.ebuild
X-VCS-Directories: net-libs/libbtbb/
X-VCS-Committer: zerochaos
X-VCS-Committer-Name: Richard Farina
X-VCS-Revision: 543eb42f3aafad30ceb50598f7816a8cda945a34
X-VCS-Branch: master
Date: Fri, 22 Jan 2016 03:17:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 15cacae6-ced6-4723-9fde-c0e53858d45d
X-Archives-Hash: d83bac83aaf4387bd1e642b4305bd8b5
commit: 543eb42f3aafad30ceb50598f7816a8cda945a34
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 03:07:17 2016 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 03:07:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=543eb42f
net-libs/libbtbb: update to support pre and port wireshark 2
Package-Manager: portage-2.2.27
net-libs/libbtbb/libbtbb-9999.ebuild | 31 +++++++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 3d12be1..f200128 100644
--- 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