* [gentoo-commits] gentoo-x86 commit in net-libs/libbtbb: libbtbb-2014.02.4.ebuild libbtbb-9999.ebuild ChangeLog libbtbb-2014.02.2.ebuild
@ 2014-11-01 18:25 Richard Farina (zerochaos)
0 siblings, 0 replies; only message in thread
From: Richard Farina (zerochaos) @ 2014-11-01 18:25 UTC (permalink / raw
To: gentoo-commits
zerochaos 14/11/01 18:25:38
Modified: libbtbb-9999.ebuild ChangeLog
Added: libbtbb-2014.02.4.ebuild
Removed: libbtbb-2014.02.2.ebuild
Log:
version bump, bug fixes against wireshark 1.12.x
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Revision Changes Path
1.13 net-libs/libbtbb/libbtbb-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild?r1=1.12&r2=1.13
Index: libbtbb-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libbtbb-9999.ebuild 4 Apr 2014 19:51:31 -0000 1.12
+++ libbtbb-9999.ebuild 1 Nov 2014 18:25:38 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.12 2014/04/04 19:51:31 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.13 2014/11/01 18:25:38 zerochaos Exp $
EAPI=5
@@ -26,24 +26,35 @@
IUSE="+pcap +wireshark-plugins"
RDEPEND="
+ net-libs/libpcap
wireshark-plugins? (
- dev-libs/glib
>=net-analyzer/wireshark-1.8.3-r1:=
)
"
DEPEND="${RDEPEND}
- wireshark-plugins? ( virtual/pkgconfig )"
+ wireshark-plugins? ( dev-libs/glib
+ virtual/pkgconfig )"
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
+which_plugins() {
+ if has_version '>=net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb"
+ elif has_version '<net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb btle btsm"
+ fi
+}
+
src_prepare(){
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
cmake-utils_src_prepare
if use wireshark-plugins; then
- for i in btbb btle btsm
+ which_plugins
+ 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}
BUILD_DIR="${WORKDIR}"/${i}_build
cmake-utils_src_prepare
@@ -62,7 +73,7 @@
cmake-utils_src_configure
if use wireshark-plugins; then
- for i in btbb btle btsm
+ for i in ${plugins}
do
CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
BUILD_DIR="${WORKDIR}"/${i}_build
@@ -80,7 +91,7 @@
cmake-utils_src_compile
if use wireshark-plugins; then
- for i in btbb btle btsm
+ for i in ${plugins}
do
CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
BUILD_DIR="${WORKDIR}"/${i}_build
@@ -95,7 +106,7 @@
cmake-utils_src_test
if use wireshark-plugins; then
- for i in btbb btle btsm
+ for i in ${plugins}
do
CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
BUILD_DIR="${WORKDIR}"/${i}_build
@@ -110,7 +121,7 @@
cmake-utils_src_install
if use wireshark-plugins; then
- for i in btbb btle btsm
+ for i in ${plugins}
do
CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
BUILD_DIR="${WORKDIR}"/${i}_build
1.18 net-libs/libbtbb/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/ChangeLog?r1=1.17&r2=1.18
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog 5 Jul 2014 02:01:06 -0000 1.17
+++ ChangeLog 1 Nov 2014 18:25:38 -0000 1.18
@@ -1,6 +1,12 @@
# ChangeLog for net-libs/libbtbb
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.17 2014/07/05 02:01:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.18 2014/11/01 18:25:38 zerochaos Exp $
+
+*libbtbb-2014.02.4 (01 Nov 2014)
+
+ 01 Nov 2014; Rick Farina <zerochaos@gentoo.org> +libbtbb-2014.02.4.ebuild,
+ -libbtbb-2014.02.2.ebuild, libbtbb-9999.ebuild:
+ version bump, bug fixes against wireshark 1.12.x
05 Jul 2014; Patrick Lauer <patrick@gentoo.org> metadata.xml:
Remove unneeded useflag description from metadata.xml
1.1 net-libs/libbtbb/libbtbb-2014.02.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/libbtbb-2014.02.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/libbtbb-2014.02.4.ebuild?rev=1.1&content-type=text/plain
Index: libbtbb-2014.02.4.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-2014.02.4.ebuild,v 1.1 2014/11/01 18:25:38 zerochaos Exp $
EAPI=5
inherit multilib cmake-utils
DESCRIPTION="A library to decode Bluetooth baseband packets"
HOMEPAGE="http://libbtbb.sourceforge.net/"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
inherit git-r3
KEYWORDS=""
else
MY_PV=${PV/\./-}
MY_PV=${MY_PV/./-R}
S=${WORKDIR}/${PN}-${MY_PV}
SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~x86"
fi
LICENSE="GPL-2"
SLOT="0/${PV}"
IUSE="+pcap +wireshark-plugins"
RDEPEND="
wireshark-plugins? (
>=net-analyzer/wireshark-1.8.3-r1:=
)
"
DEPEND="${RDEPEND}
wireshark-plugins? ( dev-libs/glib
virtual/pkgconfig )"
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
which_plugins() {
if has_version '>=net-analyzer/wireshark-1.12.0'; then
plugins="btbb"
elif has_version '<net-analyzer/wireshark-1.12.0'; then
plugins="btbb btle btsm"
fi
}
src_prepare(){
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
cmake-utils_src_prepare
if use wireshark-plugins; then
which_plugins
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}
BUILD_DIR="${WORKDIR}"/${i}_build
cmake-utils_src_prepare
done
fi
}
src_configure() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
local mycmakeargs=(
-DDISABLE_PYTHON=true
-DPACKAGE_MANAGER=true
$(cmake-utils_use pcap PCAPDUMP)
)
cmake-utils_src_configure
if use wireshark-plugins; then
for i in ${plugins}
do
CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
BUILD_DIR="${WORKDIR}"/${i}_build
local mycmakeargs=(
-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
)
cmake-utils_src_configure
done
fi
}
src_compile(){
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
cmake-utils_src_compile
if use wireshark-plugins; then
for i in ${plugins}
do
CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
BUILD_DIR="${WORKDIR}"/${i}_build
cmake-utils_src_compile
done
fi
}
src_test(){
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
cmake-utils_src_test
if use wireshark-plugins; then
for i in ${plugins}
do
CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
BUILD_DIR="${WORKDIR}"/${i}_build
cmake-utils_src_test
done
fi
}
src_install(){
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
cmake-utils_src_install
if use wireshark-plugins; then
for i in ${plugins}
do
CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
BUILD_DIR="${WORKDIR}"/${i}_build
cmake-utils_src_install
done
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-11-01 18:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-01 18:25 [gentoo-commits] gentoo-x86 commit in net-libs/libbtbb: libbtbb-2014.02.4.ebuild libbtbb-9999.ebuild ChangeLog libbtbb-2014.02.2.ebuild Richard Farina (zerochaos)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox