* [gentoo-commits] gentoo-x86 commit in net-libs/libbtbb: metadata.xml ChangeLog libbtbb-9999.ebuild
@ 2014-04-04 19:21 Richard Farina (zerochaos)
0 siblings, 0 replies; only message in thread
From: Richard Farina (zerochaos) @ 2014-04-04 19:21 UTC (permalink / raw
To: gentoo-commits
zerochaos 14/04/04 19:21:12
Modified: metadata.xml ChangeLog libbtbb-9999.ebuild
Log:
updates to live ebuild
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Revision Changes Path
1.5 net-libs/libbtbb/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/metadata.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/metadata.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/metadata.xml?r1=1.4&r2=1.5
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libbtbb/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml 8 Oct 2012 19:01:54 -0000 1.4
+++ metadata.xml 4 Apr 2014 19:21:12 -0000 1.5
@@ -6,6 +6,8 @@
<name>Rick Farina</name>
</maintainer>
<use>
+ <flag name="pcap">Add support for network packet capture via net-libs/libpcap</flag>
<flag name="wireshark">Build the wireshark plugin for bluetooth baseband sniffing</flag>
+ <flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
</use>
</pkgmetadata>
1.14 net-libs/libbtbb/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/ChangeLog?r1=1.13&r2=1.14
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog 3 Jun 2013 04:11:45 -0000 1.13
+++ ChangeLog 4 Apr 2014 19:21:12 -0000 1.14
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libbtbb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.13 2013/06/03 04:11:45 zerochaos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.14 2014/04/04 19:21:12 zerochaos Exp $
+
+ 04 Apr 2014; Rick Farina <zerochaos@gentoo.org> libbtbb-9999.ebuild,
+ metadata.xml:
+ updates to live ebuild
03 Jun 2013; Rick Farina <zerochaos@gentoo.org> -libbtbb-0.7.ebuild,
-libbtbb-0.8.ebuild, -libbtbb-2012.10.1.ebuild, -libbtbb-2012.10.3-r1.ebuild,
1.11 net-libs/libbtbb/libbtbb-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild?r1=1.10&r2=1.11
Index: libbtbb-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libbtbb-9999.ebuild 3 Jun 2013 04:11:45 -0000 1.10
+++ libbtbb-9999.ebuild 4 Apr 2014 19:21:12 -0000 1.11
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.10 2013/06/03 04:11:45 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.11 2014/04/04 19:21:12 zerochaos Exp $
EAPI=5
@@ -10,9 +10,8 @@
HOMEPAGE="http://libbtbb.sourceforge.net/"
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="http://git.code.sf.net/p/libbtbb/code"
- EGIT_PROJECT="libbtbb"
- inherit git-2
+ EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+ inherit git-r3
KEYWORDS=""
else
MY_P=${P/\./-}
@@ -24,37 +23,98 @@
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="+wireshark"
+IUSE="+pcap +wireshark-plugins"
RDEPEND="
- wireshark? (
+ wireshark-plugins? (
dev-libs/glib
>=net-analyzer/wireshark-1.8.3-r1:=
)
"
DEPEND="${RDEPEND}
- wireshark? ( virtual/pkgconfig )"
+ wireshark-plugins? ( virtual/pkgconfig )"
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-CMAKE_USE_DIR="${S}"/wireshark/plugins/btbb
+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
+ do
+ 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
-src_prepare() {
- sed -i \
- -e '/set(CMAKE_INSTALL_LIBDIR/ d' \
- -e "s:R} N:R}/wireshark/plugins/$(get_PV net-analyzer/wireshark) N:" \
- ${CMAKE_USE_DIR}/CMakeLists.txt || die
+ if use wireshark-plugins; then
+ for i in btbb btle btsm
+ 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() {
- default_src_compile
- use wireshark && cmake-utils_src_compile
+src_compile(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_compile
+
+ if use wireshark-plugins; then
+ for i in btbb btle btsm
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_compile
+ done
+ fi
}
-src_install() {
- dodir /usr/$(get_libdir)
- dodir /usr/include
- emake LDCONFIG=true DESTDIR="${D}" INSTALL_DIR="${ED}/usr/$(get_libdir)" INCLUDE_DIR="${ED}/usr/include" install
+src_test(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_test
+
+ if use wireshark-plugins; then
+ for i in btbb btle btsm
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_test
+ done
+ fi
+}
- use wireshark && cmake-utils_src_install
+src_install(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_install
+
+ if use wireshark-plugins; then
+ for i in btbb btle btsm
+ 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-04-04 19:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-04 19:21 [gentoo-commits] gentoo-x86 commit in net-libs/libbtbb: metadata.xml ChangeLog libbtbb-9999.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