| 1 |
commit: 0e2c95a78f492892c5b862445365773036f90766 |
| 2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 4 04:59:01 2017 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 4 05:06:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2c95a7 |
| 7 |
|
| 8 |
net-libs/libbtbb: bump, cleanup, enable pcapdump and btaptap properly |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
net-libs/libbtbb/Manifest | 3 +- |
| 13 |
...015.09.2-r1.ebuild => libbtbb-2017.03.1.ebuild} | 62 +++++++++++++++------- |
| 14 |
net-libs/libbtbb/libbtbb-9999.ebuild | 28 +++++----- |
| 15 |
net-libs/libbtbb/metadata.xml | 3 +- |
| 16 |
4 files changed, 61 insertions(+), 35 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest |
| 19 |
index 952fe8d5c43..5c82b8e756a 100644 |
| 20 |
--- a/net-libs/libbtbb/Manifest |
| 21 |
+++ b/net-libs/libbtbb/Manifest |
| 22 |
@@ -1,3 +1,2 @@ |
| 23 |
-DIST libbtbb-2015-09-R2.tar.gz 222045 SHA256 35ce44636649163f0d9a4de5905f686470f54c79b408959760db8c8182853161 SHA512 e300ec09de34644a0cd2f4aba2fe0b03021aaa0b0fe5035022f1e698ff10867adfd84850d0d40e9c070fbd622efee1b614221c1f5b1818f1d4f5d58cc3f31919 WHIRLPOOL 99d8c621b263cd3cd82e423eabff21d4979b0407c31430aa26424d273c9e3ed802e68833e3a100588a46a9a2126a84d0be56e41c1b609ea2eed4a3d64203c995 |
| 24 |
DIST libbtbb-2015-10-R1.tar.gz 221859 SHA256 95f493d379a53ec1134cfb36349cc9aac95d77260db4fdb557313b0dbb5c1d5a SHA512 550d793326cfb4d31ed00d46faf3521ccafc133614f866961ba6226dff41d3deda428b45f01178e0dea7925635a64e843f0510049408c3f299ad427f2c0832ac WHIRLPOOL 4ac8697150ff5215765a5331695bfc6d2967ff61a4fc89820dd8e3c72f52f51f3d5aff2b4f020de6c728cd368a295a90bbd0bb1cebb60d895c84d5219cc70e77 |
| 25 |
-DIST libbtbb-2015.09.2-rename-plugins.patch.xz 15636 SHA256 391a51ef542deecbb680d7d14f1649e8190096bce38a38965bc00fe1e97ad038 SHA512 40af251835fae9031a28720bf15ec9a903eac5fc42f38a0edf234021861e3c64e3fb77c03675ac7623b6dae901988d28f3ef90d53ea9e2b62b2d692ca0bf2d2f WHIRLPOOL eb15206c66f6293d509affa855f186ccfbb32c9d745675217c1228e7d07c0ef587bd6f997f664c1141e9fa0f4c453faefed3b82982b4099b53b81ec233b2dfec |
| 26 |
+DIST libbtbb-2017-03-R1.tar.gz 303019 SHA256 c9d163140012c9af758ea6a39a5f7193c433b107b2d4ff984f8b86821af4f181 SHA512 7535d24c70eb30eb4c0b711ee46c9aed7548ba26c9431eb9e3eac697d52afbd025534d23df24085f219be2427209fbc3a9094df65b32c5ff8a82110ce8ce4cd1 WHIRLPOOL b425583f9affe59a875702b83e9723948807691f1538979ca556655bd540bd860872398aa42635bb1883ff7fc8278fbaffb67f7efd9e2093bf635527a20c9e68 |
| 27 |
|
| 28 |
diff --git a/net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild b/net-libs/libbtbb/libbtbb-2017.03.1.ebuild |
| 29 |
similarity index 61% |
| 30 |
rename from net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild |
| 31 |
rename to net-libs/libbtbb/libbtbb-2017.03.1.ebuild |
| 32 |
index b1ddd4861ac..9fda2336a37 100644 |
| 33 |
--- a/net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild |
| 34 |
+++ b/net-libs/libbtbb/libbtbb-2017.03.1.ebuild |
| 35 |
@@ -1,9 +1,12 @@ |
| 36 |
-# Copyright 1999-2015 Gentoo Foundation |
| 37 |
+# Copyright 1999-2017 Gentoo Foundation |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
|
| 40 |
-EAPI=5 |
| 41 |
+EAPI=6 |
| 42 |
|
| 43 |
-inherit multilib cmake-utils |
| 44 |
+PYTHON_COMPAT=( python2_7 ) |
| 45 |
+DISTUTILS_OPTIONAL=1 |
| 46 |
+ |
| 47 |
+inherit multilib cmake-utils python-single-r1 |
| 48 |
|
| 49 |
DESCRIPTION="A library to decode Bluetooth baseband packets" |
| 50 |
HOMEPAGE="http://libbtbb.sourceforge.net/" |
| 51 |
@@ -16,30 +19,31 @@ else |
| 52 |
MY_PV=${PV/\./-} |
| 53 |
MY_PV=${MY_PV/./-R} |
| 54 |
S=${WORKDIR}/${PN}-${MY_PV} |
| 55 |
- SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz \ |
| 56 |
- https://dev.gentoo.org/~zerochaos/distfiles/libbtbb-2015.09.2-rename-plugins.patch.xz" |
| 57 |
+ SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz" |
| 58 |
KEYWORDS="~amd64 ~arm ~x86" |
| 59 |
fi |
| 60 |
|
| 61 |
LICENSE="GPL-2" |
| 62 |
SLOT="0/${PV}" |
| 63 |
-IUSE="+pcap +wireshark-plugins" |
| 64 |
+IUSE="extras static-libs +wireshark-plugins" |
| 65 |
|
| 66 |
-RDEPEND=" |
| 67 |
- pcap? ( net-libs/libpcap ) |
| 68 |
+RDEPEND="extras? ( ${PYTHON_DEPS} ) |
| 69 |
wireshark-plugins? ( |
| 70 |
>=net-analyzer/wireshark-1.8.3-r1:= |
| 71 |
- !>net-analyzer/wireshark-1.98 |
| 72 |
) |
| 73 |
" |
| 74 |
DEPEND="${RDEPEND} |
| 75 |
wireshark-plugins? ( dev-libs/glib |
| 76 |
virtual/pkgconfig )" |
| 77 |
|
| 78 |
+REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )" |
| 79 |
+ |
| 80 |
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; } |
| 81 |
|
| 82 |
which_plugins() { |
| 83 |
- if has_version '>=net-analyzer/wireshark-1.12.0'; then |
| 84 |
+ if has_version '>=net-analyzer/wireshark-2.2.0'; then |
| 85 |
+ plugins="" |
| 86 |
+ elif has_version '>=net-analyzer/wireshark-1.12.0'; then |
| 87 |
plugins="btbb btbredr" |
| 88 |
elif has_version '<net-analyzer/wireshark-1.12.0'; then |
| 89 |
plugins="btbb btle btsm" |
| 90 |
@@ -49,7 +53,6 @@ which_plugins() { |
| 91 |
src_prepare(){ |
| 92 |
CMAKE_USE_DIR="${S}" |
| 93 |
BUILD_DIR="${S}"_build |
| 94 |
- epatch "${WORKDIR}"/${P}-rename-plugins.patch |
| 95 |
cmake-utils_src_prepare |
| 96 |
|
| 97 |
if use wireshark-plugins; then |
| 98 |
@@ -57,7 +60,11 @@ src_prepare(){ |
| 99 |
for i in ${plugins} |
| 100 |
do |
| 101 |
sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die |
| 102 |
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} |
| 103 |
+ if has_version '>=net-analyzer/wireshark-2.0'; then |
| 104 |
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} |
| 105 |
+ else |
| 106 |
+ CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} |
| 107 |
+ fi |
| 108 |
BUILD_DIR="${WORKDIR}"/${i}_build |
| 109 |
cmake-utils_src_prepare |
| 110 |
done |
| 111 |
@@ -68,17 +75,20 @@ src_configure() { |
| 112 |
CMAKE_USE_DIR="${S}" |
| 113 |
BUILD_DIR="${S}"_build |
| 114 |
local mycmakeargs=( |
| 115 |
- -DDISABLE_PYTHON=true |
| 116 |
- -DPACKAGE_MANAGER=true |
| 117 |
- $(cmake-utils_use pcap PCAPDUMP) |
| 118 |
- $(cmake-utils_use pcap USE_PCAP) |
| 119 |
+ -DENABLE_PYTHON=$(usex extras) |
| 120 |
+ -DBUILD_STATIC_LIB=$(usex static-libs) |
| 121 |
+ -DBUILD_ROOT="${ED}" |
| 122 |
) |
| 123 |
cmake-utils_src_configure |
| 124 |
|
| 125 |
if use wireshark-plugins; then |
| 126 |
for i in ${plugins} |
| 127 |
do |
| 128 |
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} |
| 129 |
+ if has_version '>=net-analyzer/wireshark-2.0'; then |
| 130 |
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} |
| 131 |
+ else |
| 132 |
+ CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} |
| 133 |
+ fi |
| 134 |
BUILD_DIR="${WORKDIR}"/${i}_build |
| 135 |
local mycmakeargs=( |
| 136 |
-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" |
| 137 |
@@ -96,7 +106,11 @@ src_compile(){ |
| 138 |
if use wireshark-plugins; then |
| 139 |
for i in ${plugins} |
| 140 |
do |
| 141 |
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} |
| 142 |
+ if has_version '>=net-analyzer/wireshark-2.0'; then |
| 143 |
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} |
| 144 |
+ else |
| 145 |
+ CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} |
| 146 |
+ fi |
| 147 |
BUILD_DIR="${WORKDIR}"/${i}_build |
| 148 |
cmake-utils_src_compile |
| 149 |
done |
| 150 |
@@ -111,7 +125,11 @@ src_test(){ |
| 151 |
if use wireshark-plugins; then |
| 152 |
for i in ${plugins} |
| 153 |
do |
| 154 |
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} |
| 155 |
+ if has_version '>=net-analyzer/wireshark-2.0'; then |
| 156 |
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} |
| 157 |
+ else |
| 158 |
+ CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} |
| 159 |
+ fi |
| 160 |
BUILD_DIR="${WORKDIR}"/${i}_build |
| 161 |
cmake-utils_src_test |
| 162 |
done |
| 163 |
@@ -126,7 +144,11 @@ src_install(){ |
| 164 |
if use wireshark-plugins; then |
| 165 |
for i in ${plugins} |
| 166 |
do |
| 167 |
- CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} |
| 168 |
+ if has_version '>=net-analyzer/wireshark-2.0'; then |
| 169 |
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} |
| 170 |
+ else |
| 171 |
+ CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} |
| 172 |
+ fi |
| 173 |
BUILD_DIR="${WORKDIR}"/${i}_build |
| 174 |
cmake-utils_src_install |
| 175 |
done |
| 176 |
|
| 177 |
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild |
| 178 |
index 8899e59aafa..9fda2336a37 100644 |
| 179 |
--- a/net-libs/libbtbb/libbtbb-9999.ebuild |
| 180 |
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild |
| 181 |
@@ -1,9 +1,12 @@ |
| 182 |
-# Copyright 1999-2016 Gentoo Foundation |
| 183 |
+# Copyright 1999-2017 Gentoo Foundation |
| 184 |
# Distributed under the terms of the GNU General Public License v2 |
| 185 |
|
| 186 |
-EAPI=5 |
| 187 |
+EAPI=6 |
| 188 |
|
| 189 |
-inherit multilib cmake-utils |
| 190 |
+PYTHON_COMPAT=( python2_7 ) |
| 191 |
+DISTUTILS_OPTIONAL=1 |
| 192 |
+ |
| 193 |
+inherit multilib cmake-utils python-single-r1 |
| 194 |
|
| 195 |
DESCRIPTION="A library to decode Bluetooth baseband packets" |
| 196 |
HOMEPAGE="http://libbtbb.sourceforge.net/" |
| 197 |
@@ -22,10 +25,9 @@ fi |
| 198 |
|
| 199 |
LICENSE="GPL-2" |
| 200 |
SLOT="0/${PV}" |
| 201 |
-IUSE="+pcap static-libs +wireshark-plugins" |
| 202 |
+IUSE="extras static-libs +wireshark-plugins" |
| 203 |
|
| 204 |
-RDEPEND=" |
| 205 |
- pcap? ( net-libs/libpcap[static-libs?] ) |
| 206 |
+RDEPEND="extras? ( ${PYTHON_DEPS} ) |
| 207 |
wireshark-plugins? ( |
| 208 |
>=net-analyzer/wireshark-1.8.3-r1:= |
| 209 |
) |
| 210 |
@@ -34,10 +36,14 @@ DEPEND="${RDEPEND} |
| 211 |
wireshark-plugins? ( dev-libs/glib |
| 212 |
virtual/pkgconfig )" |
| 213 |
|
| 214 |
+REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )" |
| 215 |
+ |
| 216 |
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; } |
| 217 |
|
| 218 |
which_plugins() { |
| 219 |
- if has_version '>=net-analyzer/wireshark-1.12.0'; then |
| 220 |
+ if has_version '>=net-analyzer/wireshark-2.2.0'; then |
| 221 |
+ plugins="" |
| 222 |
+ elif has_version '>=net-analyzer/wireshark-1.12.0'; then |
| 223 |
plugins="btbb btbredr" |
| 224 |
elif has_version '<net-analyzer/wireshark-1.12.0'; then |
| 225 |
plugins="btbb btle btsm" |
| 226 |
@@ -69,11 +75,9 @@ src_configure() { |
| 227 |
CMAKE_USE_DIR="${S}" |
| 228 |
BUILD_DIR="${S}"_build |
| 229 |
local mycmakeargs=( |
| 230 |
- -DENABLE_PYTHON=false |
| 231 |
- -DPACKAGE_MANAGER=true |
| 232 |
- $(cmake-utils_use pcap PCAPDUMP) |
| 233 |
- $(cmake-utils_use pcap USE_PCAP) |
| 234 |
- $(cmake-utils_use static-libs BUILD_STATIC_LIB) |
| 235 |
+ -DENABLE_PYTHON=$(usex extras) |
| 236 |
+ -DBUILD_STATIC_LIB=$(usex static-libs) |
| 237 |
+ -DBUILD_ROOT="${ED}" |
| 238 |
) |
| 239 |
cmake-utils_src_configure |
| 240 |
|
| 241 |
|
| 242 |
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml |
| 243 |
index e5bbff014cb..7e1cb0b65db 100644 |
| 244 |
--- a/net-libs/libbtbb/metadata.xml |
| 245 |
+++ b/net-libs/libbtbb/metadata.xml |
| 246 |
@@ -6,7 +6,8 @@ |
| 247 |
<name>Rick Farina</name> |
| 248 |
</maintainer> |
| 249 |
<use> |
| 250 |
- <flag name="pcap">Add support for network packet capture via net-libs/libpcap</flag> |
| 251 |
+ <flag name="extras">Install pcapdump and btaptap tools</flag> |
| 252 |
+ <flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag> |
| 253 |
<flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag> |
| 254 |
</use> |
| 255 |
<upstream> |
Archives