* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2015-08-28 15:42 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2015-08-28 15:42 UTC (permalink / raw
To: gentoo-commits
commit: c0d5edc471fb4fddc39568b00d8e42e9ac7b0dee
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 15:42:33 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 15:42:33 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d5edc4
net-libs/libbtbb: restrict wireshark plugin to wireshark 1.x for now
Package-Manager: portage-2.2.20.1
net-libs/libbtbb/libbtbb-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index ef145c7..610eaab 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
pcap? ( net-libs/libpcap )
wireshark-plugins? (
>=net-analyzer/wireshark-1.8.3-r1:=
+ !>net-analyzer/wireshark-1.98
)
"
DEPEND="${RDEPEND}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2015-09-04 16:35 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2015-09-04 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 677636f1cdbcaedc2de96b8ddbf4bdf5b5c3ed7c
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 16:35:19 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 16:35:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677636f1
net-libs/libbtbb: add new btbredr wireshark plugin
Package-Manager: portage-2.2.20.1
net-libs/libbtbb/libbtbb-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 610eaab..3d12be1 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -40,7 +40,7 @@ get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_};
which_plugins() {
if has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb"
+ plugins="btbb btbredr"
elif has_version '<net-analyzer/wireshark-1.12.0'; then
plugins="btbb btle btsm"
fi
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2015-09-05 2:39 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2015-09-05 2:39 UTC (permalink / raw
To: gentoo-commits
commit: 798a48d91a4f00a514836a537edff127cc173a6d
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 02:31:40 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 02:31:48 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798a48d9
net-libs/libbtbb: version bump
net-libs/libbtbb/Manifest | 1 +
net-libs/libbtbb/libbtbb-2015.09.1.ebuild | 133 ++++++++++++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 66ade0f..88b6fd3 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1 +1,2 @@
DIST libbtbb-2014-02-R4.tar.gz 165417 SHA256 6e79a2d8530596e34ad13fcce43dcf8b30b165d4629d5bf9c3eb7f8817980524 SHA512 9ab5ca45f9a88c78f8238c73eabbd04c69723e4ac9171551e3e073eff06acd5ad4197ea4f87036ae066aebb0d15705249899d2b7475e56bd224c83df6f0bd8d5 WHIRLPOOL 30fdc8948f5d1dd057887369f12a5660b1faabe14933ad876c00161fbd43dcebc80f512e370d4b8f56525a8bdcad057a4da8c545814276a65a691bb8e85383fb
+DIST libbtbb-2015-09-R1.tar.gz 222558 SHA256 6f68eae9f8504facce33c42ee790a4ba5dbc79d89564c9a10e9e25b6eb8328b1 SHA512 30b8e376fe4be0e0a5856256cff17f889f154ff7c76ab359cab3eb62bf7f3defc9bae00150a332954f10e60a5cbb84e0ae4595f5298fe3333235b8f6b252990b WHIRLPOOL 1805eb41f7cf4814c3d2f689157b22efd25f8a5dc12f2eb407d61487bd3d270bd630b3b9c54a8e65aa523a8538d61405661267fdffc1975b42ebd4b4b6f4d84c
diff --git a/net-libs/libbtbb/libbtbb-2015.09.1.ebuild b/net-libs/libbtbb/libbtbb-2015.09.1.ebuild
new file mode 100644
index 0000000..3d12be1
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2015.09.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 -> ${PN}-${MY_PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="+pcap +wireshark-plugins"
+
+RDEPEND="
+ pcap? ( net-libs/libpcap )
+ wireshark-plugins? (
+ >=net-analyzer/wireshark-1.8.3-r1:=
+ !>net-analyzer/wireshark-1.98
+ )
+"
+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 btbredr"
+ 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_use pcap USE_PCAP)
+ )
+ 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 related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2015-09-05 2:39 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2015-09-05 2:39 UTC (permalink / raw
To: gentoo-commits
commit: 3a8fcb7f972d9b29909e6a34ea8278b1d8b6c61c
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 02:32:28 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 02:32:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a8fcb7f
net-libs/libbtbb: drop old
Package-Manager: portage-2.2.20.1
net-libs/libbtbb/Manifest | 1 -
net-libs/libbtbb/libbtbb-2014.02.4.ebuild | 130 ------------------------------
2 files changed, 131 deletions(-)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 88b6fd3..a537b80 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,2 +1 @@
-DIST libbtbb-2014-02-R4.tar.gz 165417 SHA256 6e79a2d8530596e34ad13fcce43dcf8b30b165d4629d5bf9c3eb7f8817980524 SHA512 9ab5ca45f9a88c78f8238c73eabbd04c69723e4ac9171551e3e073eff06acd5ad4197ea4f87036ae066aebb0d15705249899d2b7475e56bd224c83df6f0bd8d5 WHIRLPOOL 30fdc8948f5d1dd057887369f12a5660b1faabe14933ad876c00161fbd43dcebc80f512e370d4b8f56525a8bdcad057a4da8c545814276a65a691bb8e85383fb
DIST libbtbb-2015-09-R1.tar.gz 222558 SHA256 6f68eae9f8504facce33c42ee790a4ba5dbc79d89564c9a10e9e25b6eb8328b1 SHA512 30b8e376fe4be0e0a5856256cff17f889f154ff7c76ab359cab3eb62bf7f3defc9bae00150a332954f10e60a5cbb84e0ae4595f5298fe3333235b8f6b252990b WHIRLPOOL 1805eb41f7cf4814c3d2f689157b22efd25f8a5dc12f2eb407d61487bd3d270bd630b3b9c54a8e65aa523a8538d61405661267fdffc1975b42ebd4b4b6f4d84c
diff --git a/net-libs/libbtbb/libbtbb-2014.02.4.ebuild b/net-libs/libbtbb/libbtbb-2014.02.4.ebuild
deleted file mode 100644
index 5ad431a..0000000
--- a/net-libs/libbtbb/libbtbb-2014.02.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 -> ${PN}-${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 related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2015-09-22 2:36 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2015-09-22 2:36 UTC (permalink / raw
To: gentoo-commits
commit: 433de74a2dff50ec3f7660453a7cb35ead4fb5c4
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 02:36:10 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 02:36:49 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433de74a
net-libs/libbtbb: fix wireshark plugin naming issues with patch from upstream
Package-Manager: portage-2.2.20.1
net-libs/libbtbb/Manifest | 1 +
.../libbtbb/{libbtbb-2015.09.2.ebuild => libbtbb-2015.09.2-r1.ebuild} | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index a6cf815..222fa65 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1 +1,2 @@
DIST libbtbb-2015-09-R2.tar.gz 222045 SHA256 35ce44636649163f0d9a4de5905f686470f54c79b408959760db8c8182853161 SHA512 e300ec09de34644a0cd2f4aba2fe0b03021aaa0b0fe5035022f1e698ff10867adfd84850d0d40e9c070fbd622efee1b614221c1f5b1818f1d4f5d58cc3f31919 WHIRLPOOL 99d8c621b263cd3cd82e423eabff21d4979b0407c31430aa26424d273c9e3ed802e68833e3a100588a46a9a2126a84d0be56e41c1b609ea2eed4a3d64203c995
+DIST libbtbb-2015.09.2-rename-plugins.patch.xz 15636 SHA256 391a51ef542deecbb680d7d14f1649e8190096bce38a38965bc00fe1e97ad038 SHA512 40af251835fae9031a28720bf15ec9a903eac5fc42f38a0edf234021861e3c64e3fb77c03675ac7623b6dae901988d28f3ef90d53ea9e2b62b2d692ca0bf2d2f WHIRLPOOL eb15206c66f6293d509affa855f186ccfbb32c9d745675217c1228e7d07c0ef587bd6f997f664c1141e9fa0f4c453faefed3b82982b4099b53b81ec233b2dfec
diff --git a/net-libs/libbtbb/libbtbb-2015.09.2.ebuild b/net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild
similarity index 94%
rename from net-libs/libbtbb/libbtbb-2015.09.2.ebuild
rename to net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild
index 3d12be1..2ed51c5 100644
--- a/net-libs/libbtbb/libbtbb-2015.09.2.ebuild
+++ b/net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild
@@ -17,7 +17,8 @@ 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 -> ${PN}-${MY_PV}.tar.gz"
+ SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz \
+ https://dev.gentoo.org/~zerochaos/distfiles/libbtbb-2015.09.2-rename-plugins.patch.xz"
KEYWORDS="~amd64 ~arm ~x86"
fi
@@ -49,6 +50,7 @@ which_plugins() {
src_prepare(){
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
+ epatch "${WORKDIR}"/${P}-rename-plugins.patch
cmake-utils_src_prepare
if use wireshark-plugins; then
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2016-01-22 3:17 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2016-01-22 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 983c6cb7293ccd7b01bf09f7813c599c5bbb88ac
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 03:07:51 2016 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 03:07:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=983c6cb7
net-libs/libbtbb: fix copyright
Package-Manager: portage-2.2.27
net-libs/libbtbb/libbtbb-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index f200128..437a5c9 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2016-01-22 3:17 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2016-01-22 3:17 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2016-02-02 17:53 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2016-02-02 17:53 UTC (permalink / raw
To: gentoo-commits
commit: fea17bf34244da2b10bf5af0b8257034867a0ba4
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 2 17:52:53 2016 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 17:53:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fea17bf3
net-libs/libbtbb: add support for building static lib
Package-Manager: portage-2.2.27
net-libs/libbtbb/libbtbb-9999.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 437a5c9..d010cc0 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="+pcap +wireshark-plugins"
+IUSE="+pcap static-libs +wireshark-plugins"
RDEPEND="
pcap? ( net-libs/libpcap )
@@ -74,6 +74,7 @@ src_configure() {
-DPACKAGE_MANAGER=true
$(cmake-utils_use pcap PCAPDUMP)
$(cmake-utils_use pcap USE_PCAP)
+ $(cmake-utils_use static-libs BUILD_STATIC)
)
cmake-utils_src_configure
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2016-02-03 23:00 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2016-02-03 23:00 UTC (permalink / raw
To: gentoo-commits
commit: ad56f4684d8cd242df900ceacfa2fe37fbee076c
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 22:09:52 2016 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 23:00:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad56f468
net-libs/libbtbb: live updates, fix static-libs deps
Package-Manager: portage-2.2.27
net-libs/libbtbb/libbtbb-9999.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index d010cc0..a64a283 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -26,7 +26,7 @@ SLOT="0/${PV}"
IUSE="+pcap static-libs +wireshark-plugins"
RDEPEND="
- pcap? ( net-libs/libpcap )
+ pcap? ( net-libs/libpcap[static-libs?] )
wireshark-plugins? (
>=net-analyzer/wireshark-1.8.3-r1:=
)
@@ -70,11 +70,11 @@ src_configure() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
local mycmakeargs=(
- -DDISABLE_PYTHON=true
+ -DENABLE_PYTHON=false
-DPACKAGE_MANAGER=true
$(cmake-utils_use pcap PCAPDUMP)
$(cmake-utils_use pcap USE_PCAP)
- $(cmake-utils_use static-libs BUILD_STATIC)
+ $(cmake-utils_use static-libs BUILD_STATIC_LIB)
)
cmake-utils_src_configure
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2017-03-04 5:06 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2017-03-04 5:06 UTC (permalink / raw
To: gentoo-commits
commit: 0e2c95a78f492892c5b862445365773036f90766
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 04:59:01 2017 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 05:06:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2c95a7
net-libs/libbtbb: bump, cleanup, enable pcapdump and btaptap properly
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-libs/libbtbb/Manifest | 3 +-
...015.09.2-r1.ebuild => libbtbb-2017.03.1.ebuild} | 62 +++++++++++++++-------
net-libs/libbtbb/libbtbb-9999.ebuild | 28 +++++-----
net-libs/libbtbb/metadata.xml | 3 +-
4 files changed, 61 insertions(+), 35 deletions(-)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 952fe8d5c43..5c82b8e756a 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,3 +1,2 @@
-DIST libbtbb-2015-09-R2.tar.gz 222045 SHA256 35ce44636649163f0d9a4de5905f686470f54c79b408959760db8c8182853161 SHA512 e300ec09de34644a0cd2f4aba2fe0b03021aaa0b0fe5035022f1e698ff10867adfd84850d0d40e9c070fbd622efee1b614221c1f5b1818f1d4f5d58cc3f31919 WHIRLPOOL 99d8c621b263cd3cd82e423eabff21d4979b0407c31430aa26424d273c9e3ed802e68833e3a100588a46a9a2126a84d0be56e41c1b609ea2eed4a3d64203c995
DIST libbtbb-2015-10-R1.tar.gz 221859 SHA256 95f493d379a53ec1134cfb36349cc9aac95d77260db4fdb557313b0dbb5c1d5a SHA512 550d793326cfb4d31ed00d46faf3521ccafc133614f866961ba6226dff41d3deda428b45f01178e0dea7925635a64e843f0510049408c3f299ad427f2c0832ac WHIRLPOOL 4ac8697150ff5215765a5331695bfc6d2967ff61a4fc89820dd8e3c72f52f51f3d5aff2b4f020de6c728cd368a295a90bbd0bb1cebb60d895c84d5219cc70e77
-DIST libbtbb-2015.09.2-rename-plugins.patch.xz 15636 SHA256 391a51ef542deecbb680d7d14f1649e8190096bce38a38965bc00fe1e97ad038 SHA512 40af251835fae9031a28720bf15ec9a903eac5fc42f38a0edf234021861e3c64e3fb77c03675ac7623b6dae901988d28f3ef90d53ea9e2b62b2d692ca0bf2d2f WHIRLPOOL eb15206c66f6293d509affa855f186ccfbb32c9d745675217c1228e7d07c0ef587bd6f997f664c1141e9fa0f4c453faefed3b82982b4099b53b81ec233b2dfec
+DIST libbtbb-2017-03-R1.tar.gz 303019 SHA256 c9d163140012c9af758ea6a39a5f7193c433b107b2d4ff984f8b86821af4f181 SHA512 7535d24c70eb30eb4c0b711ee46c9aed7548ba26c9431eb9e3eac697d52afbd025534d23df24085f219be2427209fbc3a9094df65b32c5ff8a82110ce8ce4cd1 WHIRLPOOL b425583f9affe59a875702b83e9723948807691f1538979ca556655bd540bd860872398aa42635bb1883ff7fc8278fbaffb67f7efd9e2093bf635527a20c9e68
diff --git a/net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild b/net-libs/libbtbb/libbtbb-2017.03.1.ebuild
similarity index 61%
rename from net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild
rename to net-libs/libbtbb/libbtbb-2017.03.1.ebuild
index b1ddd4861ac..9fda2336a37 100644
--- a/net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2017.03.1.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit multilib cmake-utils
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit multilib cmake-utils python-single-r1
DESCRIPTION="A library to decode Bluetooth baseband packets"
HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -16,30 +19,31 @@ 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 -> ${PN}-${MY_PV}.tar.gz \
- https://dev.gentoo.org/~zerochaos/distfiles/libbtbb-2015.09.2-rename-plugins.patch.xz"
+ SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~x86"
fi
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="+pcap +wireshark-plugins"
+IUSE="extras static-libs +wireshark-plugins"
-RDEPEND="
- pcap? ( net-libs/libpcap )
+RDEPEND="extras? ( ${PYTHON_DEPS} )
wireshark-plugins? (
>=net-analyzer/wireshark-1.8.3-r1:=
- !>net-analyzer/wireshark-1.98
)
"
DEPEND="${RDEPEND}
wireshark-plugins? ( dev-libs/glib
virtual/pkgconfig )"
+REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )"
+
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
+ if has_version '>=net-analyzer/wireshark-2.2.0'; then
+ plugins=""
+ elif has_version '>=net-analyzer/wireshark-1.12.0'; then
plugins="btbb btbredr"
elif has_version '<net-analyzer/wireshark-1.12.0'; then
plugins="btbb btle btsm"
@@ -49,7 +53,6 @@ which_plugins() {
src_prepare(){
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
- epatch "${WORKDIR}"/${P}-rename-plugins.patch
cmake-utils_src_prepare
if use wireshark-plugins; then
@@ -57,7 +60,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
@@ -68,17 +75,20 @@ 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_use pcap USE_PCAP)
+ -DENABLE_PYTHON=$(usex extras)
+ -DBUILD_STATIC_LIB=$(usex static-libs)
+ -DBUILD_ROOT="${ED}"
)
cmake-utils_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)"
@@ -96,7 +106,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
@@ -111,7 +125,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
@@ -126,7 +144,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
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 8899e59aafa..9fda2336a37 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit multilib cmake-utils
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit multilib cmake-utils python-single-r1
DESCRIPTION="A library to decode Bluetooth baseband packets"
HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -22,10 +25,9 @@ fi
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="+pcap static-libs +wireshark-plugins"
+IUSE="extras static-libs +wireshark-plugins"
-RDEPEND="
- pcap? ( net-libs/libpcap[static-libs?] )
+RDEPEND="extras? ( ${PYTHON_DEPS} )
wireshark-plugins? (
>=net-analyzer/wireshark-1.8.3-r1:=
)
@@ -34,10 +36,14 @@ DEPEND="${RDEPEND}
wireshark-plugins? ( dev-libs/glib
virtual/pkgconfig )"
+REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )"
+
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
+ if has_version '>=net-analyzer/wireshark-2.2.0'; then
+ plugins=""
+ elif has_version '>=net-analyzer/wireshark-1.12.0'; then
plugins="btbb btbredr"
elif has_version '<net-analyzer/wireshark-1.12.0'; then
plugins="btbb btle btsm"
@@ -69,11 +75,9 @@ src_configure() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
local mycmakeargs=(
- -DENABLE_PYTHON=false
- -DPACKAGE_MANAGER=true
- $(cmake-utils_use pcap PCAPDUMP)
- $(cmake-utils_use pcap USE_PCAP)
- $(cmake-utils_use static-libs BUILD_STATIC_LIB)
+ -DENABLE_PYTHON=$(usex extras)
+ -DBUILD_STATIC_LIB=$(usex static-libs)
+ -DBUILD_ROOT="${ED}"
)
cmake-utils_src_configure
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index e5bbff014cb..7e1cb0b65db 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -6,7 +6,8 @@
<name>Rick Farina</name>
</maintainer>
<use>
- <flag name="pcap">Add support for network packet capture via net-libs/libpcap</flag>
+ <flag name="extras">Install pcapdump and btaptap tools</flag>
+ <flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
<flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2017-03-04 5:08 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2017-03-04 5:08 UTC (permalink / raw
To: gentoo-commits
commit: b443bbd5e82ad5e28df7a6b90574bf4886e5ca47
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 05:08:27 2017 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 05:08:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b443bbd5
net-libs/libbtbb: wireshark-plugins are in wireshark now, undefault the use flag
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-libs/libbtbb/libbtbb-2017.03.1.ebuild | 2 +-
net-libs/libbtbb/libbtbb-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-libs/libbtbb/libbtbb-2017.03.1.ebuild b/net-libs/libbtbb/libbtbb-2017.03.1.ebuild
index 9fda2336a37..b29bdf56932 100644
--- a/net-libs/libbtbb/libbtbb-2017.03.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2017.03.1.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="extras static-libs +wireshark-plugins"
+IUSE="extras static-libs wireshark-plugins"
RDEPEND="extras? ( ${PYTHON_DEPS} )
wireshark-plugins? (
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 9fda2336a37..b29bdf56932 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="extras static-libs +wireshark-plugins"
+IUSE="extras static-libs wireshark-plugins"
RDEPEND="extras? ( ${PYTHON_DEPS} )
wireshark-plugins? (
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2017-03-20 17:07 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2017-03-20 17:07 UTC (permalink / raw
To: gentoo-commits
commit: ac1586a4cd3bf09520bf88375e71037f26e37ae5
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 17:05:11 2017 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 17:06:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1586a4
net-libs/libbtbb: bump
Package-Manager: Portage-2.3.4, Repoman-2.3.2
net-libs/libbtbb/Manifest | 2 +-
net-libs/libbtbb/{libbtbb-2017.03.1.ebuild => libbtbb-2017.03.2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 5c82b8e756a..eee1d1452b6 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,2 +1,2 @@
DIST libbtbb-2015-10-R1.tar.gz 221859 SHA256 95f493d379a53ec1134cfb36349cc9aac95d77260db4fdb557313b0dbb5c1d5a SHA512 550d793326cfb4d31ed00d46faf3521ccafc133614f866961ba6226dff41d3deda428b45f01178e0dea7925635a64e843f0510049408c3f299ad427f2c0832ac WHIRLPOOL 4ac8697150ff5215765a5331695bfc6d2967ff61a4fc89820dd8e3c72f52f51f3d5aff2b4f020de6c728cd368a295a90bbd0bb1cebb60d895c84d5219cc70e77
-DIST libbtbb-2017-03-R1.tar.gz 303019 SHA256 c9d163140012c9af758ea6a39a5f7193c433b107b2d4ff984f8b86821af4f181 SHA512 7535d24c70eb30eb4c0b711ee46c9aed7548ba26c9431eb9e3eac697d52afbd025534d23df24085f219be2427209fbc3a9094df65b32c5ff8a82110ce8ce4cd1 WHIRLPOOL b425583f9affe59a875702b83e9723948807691f1538979ca556655bd540bd860872398aa42635bb1883ff7fc8278fbaffb67f7efd9e2093bf635527a20c9e68
+DIST libbtbb-2017-03-R2.tar.gz 303689 SHA256 2b3ea5f07b7022e862f367e8a9a217e1d10920aecdc4eba7b7309724fb229cfd SHA512 bb7b58a33198fd64fba5f0254cfbb71120c70476d594a7aaf82c77f770d1a6e89b4571f42d3d15c1d93d5246c9145c33ba8724a5ee5ad84e96f748d9f32275b5 WHIRLPOOL d594162d36224ae12d719ecb1139099e6cebb3719dec34dee7e3702ffcdf446e77b7d8efed94415dcdb08410de25150fb5a75a0b00f2fa1bb08e67b0577d715a
diff --git a/net-libs/libbtbb/libbtbb-2017.03.1.ebuild b/net-libs/libbtbb/libbtbb-2017.03.2.ebuild
similarity index 100%
rename from net-libs/libbtbb/libbtbb-2017.03.1.ebuild
rename to net-libs/libbtbb/libbtbb-2017.03.2.ebuild
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2018-01-11 16:02 Michał Górny
0 siblings, 0 replies; 34+ messages in thread
From: Michał Górny @ 2018-01-11 16:02 UTC (permalink / raw
To: gentoo-commits
commit: 26cba9895716c8dd9462241105d96c440678ecff
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 16:01:26 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 16:02:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26cba989
net-libs/libbtbb: Clean the old version up
Remove the old version that is impossible to install due to requirement
on net-analyzer/wireshark versions that are no longer present
in ::gentoo.
net-libs/libbtbb/Manifest | 1 -
net-libs/libbtbb/libbtbb-2015.10.1.ebuild | 132 ------------------------------
2 files changed, 133 deletions(-)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index c62b1b24f01..faa70bb24b2 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,2 +1 @@
-DIST libbtbb-2015-10-R1.tar.gz 221859 BLAKE2B ee24849f85b4ec1d0eac0c6779bb30074e7544dd07eea4591db5503322f4ce238bd5817900665def51b36b533d360ca7b0d2cf1464643d4a25a897fb1fb5fa86 SHA512 550d793326cfb4d31ed00d46faf3521ccafc133614f866961ba6226dff41d3deda428b45f01178e0dea7925635a64e843f0510049408c3f299ad427f2c0832ac
DIST libbtbb-2017-03-R2.tar.gz 303689 BLAKE2B d36cf5329fb31cd50f64e3a9b625ebca8bf198794073480baa4f64935f4bef183e4c11f0844cd31df943da98c778bdea807fbd91676c23a3a2f830af5e7a185f SHA512 bb7b58a33198fd64fba5f0254cfbb71120c70476d594a7aaf82c77f770d1a6e89b4571f42d3d15c1d93d5246c9145c33ba8724a5ee5ad84e96f748d9f32275b5
diff --git a/net-libs/libbtbb/libbtbb-2015.10.1.ebuild b/net-libs/libbtbb/libbtbb-2015.10.1.ebuild
deleted file mode 100644
index 7734344c353..00000000000
--- a/net-libs/libbtbb/libbtbb-2015.10.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="+pcap +wireshark-plugins"
-
-RDEPEND="
- pcap? ( net-libs/libpcap )
- wireshark-plugins? (
- >=net-analyzer/wireshark-1.8.3-r1:=
- !>net-analyzer/wireshark-1.98
- )
-"
-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 btbredr"
- 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_use pcap USE_PCAP)
- )
- 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 related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2018-01-11 16:06 Michał Górny
0 siblings, 0 replies; 34+ messages in thread
From: Michał Górny @ 2018-01-11 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 5ef2e9167c4b021a5268767952d4e6f53e0d66d4
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 16:03:40 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 16:05:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef2e916
net-libs/libbtbb: Remove unused local USE description
net-libs/libbtbb/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index f8987771de3..810dd5222c3 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="extras">Install pcapdump and btaptap tools</flag>
- <flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
<flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2018-08-07 23:10 Richard Farina
0 siblings, 0 replies; 34+ messages in thread
From: Richard Farina @ 2018-08-07 23:10 UTC (permalink / raw
To: gentoo-commits
commit: 51c9c9b82e3b44113d39097189bd4f36cc081fc7
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 7 23:09:16 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 7 23:10:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c9c9b8
net-libs/libbtbb: bump
Package-Manager: Portage-2.3.44, Repoman-2.3.10
net-libs/libbtbb/Manifest | 1 +
net-libs/libbtbb/libbtbb-2018.08.1.ebuild | 156 ++++++++++++++++++++++++++++++
2 files changed, 157 insertions(+)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index faa70bb24b2..e4328814588 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1 +1,2 @@
DIST libbtbb-2017-03-R2.tar.gz 303689 BLAKE2B d36cf5329fb31cd50f64e3a9b625ebca8bf198794073480baa4f64935f4bef183e4c11f0844cd31df943da98c778bdea807fbd91676c23a3a2f830af5e7a185f SHA512 bb7b58a33198fd64fba5f0254cfbb71120c70476d594a7aaf82c77f770d1a6e89b4571f42d3d15c1d93d5246c9145c33ba8724a5ee5ad84e96f748d9f32275b5
+DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
new file mode 100644
index 00000000000..998113cc402
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit multilib cmake-utils python-single-r1
+
+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 -> ${PN}-${MY_PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="extras static-libs wireshark-plugins"
+
+RDEPEND="extras? ( ${PYTHON_DEPS} )
+ wireshark-plugins? (
+ >=net-analyzer/wireshark-1.8.3-r1:=
+ )
+"
+DEPEND="${RDEPEND}
+ wireshark-plugins? ( dev-libs/glib
+ virtual/pkgconfig )"
+
+REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )"
+
+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-2.2.0'; then
+ plugins=""
+ elif has_version '>=net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb btbredr"
+ 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
+ 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
+ fi
+}
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ local mycmakeargs=(
+ -DENABLE_PYTHON=$(usex extras)
+ -DBUILD_STATIC_LIB=$(usex static-libs)
+ -DBUILD_ROOT="${ED}"
+ )
+ cmake-utils_src_configure
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ 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)"
+ )
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ fi
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2019-03-20 2:25 Rick Farina
0 siblings, 0 replies; 34+ messages in thread
From: Rick Farina @ 2019-03-20 2:25 UTC (permalink / raw
To: gentoo-commits
commit: 8bfe57467b6f6348dbded2ff14cbbbf3fbb156a9
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 00:42:03 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 02:25:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfe5746
net-libs/libbtbb: bump
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-libs/libbtbb/Manifest | 2 +-
net-libs/libbtbb/libbtbb-2018.08.1.ebuild | 3 +--
.../libbtbb/{libbtbb-2017.03.2.ebuild => libbtbb-2018.12.1.ebuild} | 3 +--
net-libs/libbtbb/libbtbb-9999.ebuild | 3 +--
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index e4328814588..5523e14eef9 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,2 +1,2 @@
-DIST libbtbb-2017-03-R2.tar.gz 303689 BLAKE2B d36cf5329fb31cd50f64e3a9b625ebca8bf198794073480baa4f64935f4bef183e4c11f0844cd31df943da98c778bdea807fbd91676c23a3a2f830af5e7a185f SHA512 bb7b58a33198fd64fba5f0254cfbb71120c70476d594a7aaf82c77f770d1a6e89b4571f42d3d15c1d93d5246c9145c33ba8724a5ee5ad84e96f748d9f32275b5
DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
+DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
index 998113cc402..0fa2d6551dd 100644
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,6 @@ 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}
diff --git a/net-libs/libbtbb/libbtbb-2017.03.2.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
similarity index 98%
rename from net-libs/libbtbb/libbtbb-2017.03.2.ebuild
rename to net-libs/libbtbb/libbtbb-2018.12.1.ebuild
index b29bdf56932..0fa2d6551dd 100644
--- a/net-libs/libbtbb/libbtbb-2017.03.2.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,6 @@ 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}
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index b29bdf56932..0fa2d6551dd 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,6 @@ 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}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2020-07-05 13:36 Agostino Sarubbo
0 siblings, 0 replies; 34+ messages in thread
From: Agostino Sarubbo @ 2020-07-05 13:36 UTC (permalink / raw
To: gentoo-commits
commit: ad75fe8b29a32187626a6eb1fbf54898132df736
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 5 13:34:19 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jul 5 13:34:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad75fe8b
net-libs/libbtbb: amd64 stable wrt bug #702448
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-libs/libbtbb/libbtbb-2018.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
index ee2dca3e96c..9b6dba69365 100644
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
@@ -19,7 +19,7 @@ else
MY_PV=${MY_PV/./-R}
S=${WORKDIR}/${PN}-${MY_PV}
SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm ~x86"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2020-07-05 13:38 Agostino Sarubbo
0 siblings, 0 replies; 34+ messages in thread
From: Agostino Sarubbo @ 2020-07-05 13:38 UTC (permalink / raw
To: gentoo-commits
commit: 38e850cf5133f9feb6437c8ae8cc3899e2ec3795
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 5 13:37:46 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jul 5 13:37:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e850cf
net-libs/libbtbb: arm stable wrt bug #702448
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-libs/libbtbb/libbtbb-2018.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
index 9b6dba69365..506ac122753 100644
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
@@ -19,7 +19,7 @@ else
MY_PV=${MY_PV/./-R}
S=${WORKDIR}/${PN}-${MY_PV}
SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~x86"
+ KEYWORDS="amd64 arm ~x86"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2020-07-05 13:44 Agostino Sarubbo
0 siblings, 0 replies; 34+ messages in thread
From: Agostino Sarubbo @ 2020-07-05 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 2817818efb43d37c3de5df0c02e06eb5a74766e2
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 5 13:43:16 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jul 5 13:43:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2817818e
net-libs/libbtbb: x86 stable wrt bug #702448
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-libs/libbtbb/libbtbb-2018.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
index 506ac122753..b2017354f2a 100644
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
@@ -19,7 +19,7 @@ else
MY_PV=${MY_PV/./-R}
S=${WORKDIR}/${PN}-${MY_PV}
SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="amd64 arm ~x86"
+ KEYWORDS="amd64 arm x86"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2020-09-01 9:07 Michał Górny
0 siblings, 0 replies; 34+ messages in thread
From: Michał Górny @ 2020-09-01 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 3f7eab9ae999cfd31debc0a9ebe822ed0fb375e7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 1 08:29:13 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 1 09:06:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7eab9a
net-libs/libbtbb: Remove USE=extras (python2)
Closes: https://bugs.gentoo.org/735418
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-libs/libbtbb/libbtbb-2018.08.1.ebuild | 13 ++++---------
net-libs/libbtbb/libbtbb-2018.12.1.ebuild | 13 ++++---------
net-libs/libbtbb/libbtbb-9999.ebuild | 13 ++++---------
net-libs/libbtbb/metadata.xml | 1 -
4 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
index ee2dca3e96c..a1587cd739a 100644
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -3,10 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit multilib cmake-utils python-single-r1
+inherit multilib cmake-utils
DESCRIPTION="A library to decode Bluetooth baseband packets"
HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -24,9 +21,9 @@ fi
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="extras static-libs wireshark-plugins"
+IUSE="static-libs wireshark-plugins"
-RDEPEND="extras? ( ${PYTHON_DEPS} )
+RDEPEND="
wireshark-plugins? (
>=net-analyzer/wireshark-1.8.3-r1:=
)
@@ -35,8 +32,6 @@ DEPEND="${RDEPEND}
wireshark-plugins? ( dev-libs/glib
virtual/pkgconfig )"
-REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )"
-
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
which_plugins() {
@@ -74,7 +69,7 @@ src_configure() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
local mycmakeargs=(
- -DENABLE_PYTHON=$(usex extras)
+ -DENABLE_PYTHON=OFF
-DBUILD_STATIC_LIB=$(usex static-libs)
-DBUILD_ROOT="${ED}"
)
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
index b2017354f2a..d3976d1260b 100644
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
@@ -3,10 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit multilib cmake-utils python-single-r1
+inherit multilib cmake-utils
DESCRIPTION="A library to decode Bluetooth baseband packets"
HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -24,9 +21,9 @@ fi
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="extras static-libs wireshark-plugins"
+IUSE="static-libs wireshark-plugins"
-RDEPEND="extras? ( ${PYTHON_DEPS} )
+RDEPEND="
wireshark-plugins? (
>=net-analyzer/wireshark-1.8.3-r1:=
)
@@ -35,8 +32,6 @@ DEPEND="${RDEPEND}
wireshark-plugins? ( dev-libs/glib
virtual/pkgconfig )"
-REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )"
-
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
which_plugins() {
@@ -74,7 +69,7 @@ src_configure() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
local mycmakeargs=(
- -DENABLE_PYTHON=$(usex extras)
+ -DENABLE_PYTHON=OFF
-DBUILD_STATIC_LIB=$(usex static-libs)
-DBUILD_ROOT="${ED}"
)
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index ee2dca3e96c..a1587cd739a 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -3,10 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit multilib cmake-utils python-single-r1
+inherit multilib cmake-utils
DESCRIPTION="A library to decode Bluetooth baseband packets"
HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -24,9 +21,9 @@ fi
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="extras static-libs wireshark-plugins"
+IUSE="static-libs wireshark-plugins"
-RDEPEND="extras? ( ${PYTHON_DEPS} )
+RDEPEND="
wireshark-plugins? (
>=net-analyzer/wireshark-1.8.3-r1:=
)
@@ -35,8 +32,6 @@ DEPEND="${RDEPEND}
wireshark-plugins? ( dev-libs/glib
virtual/pkgconfig )"
-REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )"
-
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
which_plugins() {
@@ -74,7 +69,7 @@ src_configure() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
local mycmakeargs=(
- -DENABLE_PYTHON=$(usex extras)
+ -DENABLE_PYTHON=OFF
-DBUILD_STATIC_LIB=$(usex static-libs)
-DBUILD_ROOT="${ED}"
)
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index 810dd5222c3..3127bca391a 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -6,7 +6,6 @@
<name>Rick Farina</name>
</maintainer>
<use>
- <flag name="extras">Install pcapdump and btaptap tools</flag>
<flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2021-01-07 3:00 Rick Farina
0 siblings, 0 replies; 34+ messages in thread
From: Rick Farina @ 2021-01-07 3:00 UTC (permalink / raw
To: gentoo-commits
commit: f30bf3ec75bbbc8ba7cd8e6dd5085bc731a2966e
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 02:59:09 2021 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Jan 7 02:59:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30bf3ec
net-libs/libbtbb: bump
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-libs/libbtbb/Manifest | 1 +
net-libs/libbtbb/libbtbb-2020.12.1.ebuild | 150 ++++++++++++++++++++++++++++++
2 files changed, 151 insertions(+)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 5523e14eef9..db5113ea61a 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,2 +1,3 @@
DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
+DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b SHA512 a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
new file mode 100644
index 00000000000..758b20c33cd
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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
+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 -> ${PN}-${MY_PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="static-libs 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-2.2.0'; then
+ plugins=""
+ elif has_version '>=net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb btbredr"
+ 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
+ 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
+ fi
+}
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ local mycmakeargs=(
+ -DENABLE_PYTHON=OFF
+ -DBUILD_STATIC_LIB=$(usex static-libs)
+ -DBUILD_ROOT="${ED}"
+ )
+ cmake-utils_src_configure
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ 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)"
+ )
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ fi
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2021-03-30 20:20 Rick Farina
0 siblings, 0 replies; 34+ messages in thread
From: Rick Farina @ 2021-03-30 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 926f35c93c331860b759a883674e596e1f0c152f
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 20:17:25 2021 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 20:17:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=926f35c9
net-libs/libbtbb: migrate off cmake-utils
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-libs/libbtbb/libbtbb-2020.12.1.ebuild | 24 ++++++++++++------------
net-libs/libbtbb/libbtbb-9999.ebuild | 26 +++++++++++++-------------
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
index 758b20c33cd..6db493027e1 100644
--- a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit multilib cmake-utils
+inherit multilib cmake
DESCRIPTION="A library to decode Bluetooth baseband packets"
HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -47,7 +47,7 @@ which_plugins() {
src_prepare() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
- cmake-utils_src_prepare
+ cmake_src_prepare
if use wireshark-plugins; then
which_plugins
@@ -60,7 +60,7 @@ src_prepare() {
CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
fi
BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_prepare
+ cmake_src_prepare
done
fi
}
@@ -73,7 +73,7 @@ src_configure() {
-DBUILD_STATIC_LIB=$(usex static-libs)
-DBUILD_ROOT="${ED}"
)
- cmake-utils_src_configure
+ cmake_src_configure
if use wireshark-plugins; then
for i in ${plugins}
@@ -87,7 +87,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
)
- cmake-utils_src_configure
+ cmake_src_configure
done
fi
}
@@ -95,7 +95,7 @@ src_configure() {
src_compile() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
- cmake-utils_src_compile
+ cmake_src_compile
if use wireshark-plugins; then
for i in ${plugins}
@@ -106,7 +106,7 @@ src_compile() {
CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
fi
BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_compile
+ cmake_src_compile
done
fi
}
@@ -114,7 +114,7 @@ src_compile() {
src_test() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
- cmake-utils_src_test
+ cmake_src_test
if use wireshark-plugins; then
for i in ${plugins}
@@ -125,7 +125,7 @@ src_test() {
CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
fi
BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_test
+ cmake_src_test
done
fi
}
@@ -133,7 +133,7 @@ src_test() {
src_install() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
- cmake-utils_src_install
+ cmake_src_install
if use wireshark-plugins; then
for i in ${plugins}
@@ -144,7 +144,7 @@ src_install() {
CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
fi
BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_install
+ cmake_src_install
done
fi
}
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index a1587cd739a..6db493027e1 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit multilib cmake-utils
+inherit multilib cmake
DESCRIPTION="A library to decode Bluetooth baseband packets"
HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -47,7 +47,7 @@ which_plugins() {
src_prepare() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
- cmake-utils_src_prepare
+ cmake_src_prepare
if use wireshark-plugins; then
which_plugins
@@ -60,7 +60,7 @@ src_prepare() {
CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
fi
BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_prepare
+ cmake_src_prepare
done
fi
}
@@ -73,7 +73,7 @@ src_configure() {
-DBUILD_STATIC_LIB=$(usex static-libs)
-DBUILD_ROOT="${ED}"
)
- cmake-utils_src_configure
+ cmake_src_configure
if use wireshark-plugins; then
for i in ${plugins}
@@ -87,7 +87,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
)
- cmake-utils_src_configure
+ cmake_src_configure
done
fi
}
@@ -95,7 +95,7 @@ src_configure() {
src_compile() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
- cmake-utils_src_compile
+ cmake_src_compile
if use wireshark-plugins; then
for i in ${plugins}
@@ -106,7 +106,7 @@ src_compile() {
CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
fi
BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_compile
+ cmake_src_compile
done
fi
}
@@ -114,7 +114,7 @@ src_compile() {
src_test() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
- cmake-utils_src_test
+ cmake_src_test
if use wireshark-plugins; then
for i in ${plugins}
@@ -125,7 +125,7 @@ src_test() {
CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
fi
BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_test
+ cmake_src_test
done
fi
}
@@ -133,7 +133,7 @@ src_test() {
src_install() {
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
- cmake-utils_src_install
+ cmake_src_install
if use wireshark-plugins; then
for i in ${plugins}
@@ -144,7 +144,7 @@ src_install() {
CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
fi
BUILD_DIR="${WORKDIR}"/${i}_build
- cmake-utils_src_install
+ cmake_src_install
done
fi
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2021-03-30 20:20 Rick Farina
0 siblings, 0 replies; 34+ messages in thread
From: Rick Farina @ 2021-03-30 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 9820e1418912ba9d7723b9caa66462bfe7396940
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 20:18:38 2021 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 20:18:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9820e141
net-libs/libbtbb: drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-libs/libbtbb/Manifest | 2 -
net-libs/libbtbb/libbtbb-2018.08.1.ebuild | 150 ------------------------------
net-libs/libbtbb/libbtbb-2018.12.1.ebuild | 150 ------------------------------
3 files changed, 302 deletions(-)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index db5113ea61a..512e1bc72a5 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,3 +1 @@
-DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
-DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b SHA512 a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
deleted file mode 100644
index a1587cd739a..00000000000
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-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 -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs 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-2.2.0'; then
- plugins=""
- elif has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btbredr"
- 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
- 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
- fi
-}
-
-src_configure() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- local mycmakeargs=(
- -DENABLE_PYTHON=OFF
- -DBUILD_STATIC_LIB=$(usex static-libs)
- -DBUILD_ROOT="${ED}"
- )
- cmake-utils_src_configure
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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)"
- )
- 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
- 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
- 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
- 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
- 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
- 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
- fi
-}
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
deleted file mode 100644
index d3976d1260b..00000000000
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-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 -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="amd64 arm x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs 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-2.2.0'; then
- plugins=""
- elif has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btbredr"
- 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
- 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
- fi
-}
-
-src_configure() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- local mycmakeargs=(
- -DENABLE_PYTHON=OFF
- -DBUILD_STATIC_LIB=$(usex static-libs)
- -DBUILD_ROOT="${ED}"
- )
- cmake-utils_src_configure
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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)"
- )
- 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
- 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
- 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
- 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
- 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
- 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
- fi
-}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2021-03-30 23:27 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-03-30 23:27 UTC (permalink / raw
To: gentoo-commits
commit: e44e1ccc95b08bca1f9d1fa356bf5a123ffcc82c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 23:26:30 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 23:26:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44e1ccc
net-libs/libbtbb: Revert "drop old" (restore stable version)
ubertooth has a stable version so needs a stable net-libs/libbtbb.
This reverts commit 9820e1418912ba9d7723b9caa66462bfe7396940.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/libbtbb/Manifest | 2 +
net-libs/libbtbb/libbtbb-2018.08.1.ebuild | 150 ++++++++++++++++++++++++++++++
net-libs/libbtbb/libbtbb-2018.12.1.ebuild | 150 ++++++++++++++++++++++++++++++
3 files changed, 302 insertions(+)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 512e1bc72a5..db5113ea61a 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1 +1,3 @@
+DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
+DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b SHA512 a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
new file mode 100644
index 00000000000..a1587cd739a
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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
+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 -> ${PN}-${MY_PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="static-libs 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-2.2.0'; then
+ plugins=""
+ elif has_version '>=net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb btbredr"
+ 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
+ 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
+ fi
+}
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ local mycmakeargs=(
+ -DENABLE_PYTHON=OFF
+ -DBUILD_STATIC_LIB=$(usex static-libs)
+ -DBUILD_ROOT="${ED}"
+ )
+ cmake-utils_src_configure
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ 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)"
+ )
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ fi
+}
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
new file mode 100644
index 00000000000..d3976d1260b
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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
+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 -> ${PN}-${MY_PV}.tar.gz"
+ KEYWORDS="amd64 arm x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="static-libs 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-2.2.0'; then
+ plugins=""
+ elif has_version '>=net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb btbredr"
+ 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
+ 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
+ fi
+}
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ local mycmakeargs=(
+ -DENABLE_PYTHON=OFF
+ -DBUILD_STATIC_LIB=$(usex static-libs)
+ -DBUILD_ROOT="${ED}"
+ )
+ cmake-utils_src_configure
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ 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)"
+ )
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ fi
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2022-01-10 16:03 Andreas Sturmlechner
0 siblings, 0 replies; 34+ messages in thread
From: Andreas Sturmlechner @ 2022-01-10 16:03 UTC (permalink / raw
To: gentoo-commits
commit: 6255cd60a0ce21c07373ec6a9f2b834329c34572
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 9 20:21:27 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 16:03:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6255cd60
net-libs/libbtbb: Cruft-free 2020.12.1 revbump
Bug: https://bugs.gentoo.org/789234
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild | 32 ++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
new file mode 100644
index 000000000000..9085d00e99ef
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library to decode Bluetooth baseband packets"
+HOMEPAGE="https://github.com/greatscottgadgets/libbtbb"
+
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+ inherit git-r3
+else
+ MY_PV=${PV/\./-}
+ MY_PV=${MY_PV/./-R}
+ SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+ S="${WORKDIR}"/${PN}-${MY_PV}
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="static-libs"
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_PYTHON=OFF
+ -DBUILD_STATIC_LIB=$(usex static-libs)
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2022-01-10 16:03 Andreas Sturmlechner
0 siblings, 0 replies; 34+ messages in thread
From: Andreas Sturmlechner @ 2022-01-10 16:03 UTC (permalink / raw
To: gentoo-commits
commit: 75cc60a219910a9240526b00a23adb600852fe79
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 9 20:18:28 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 16:03:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75cc60a2
net-libs/libbtbb: Drop IUSE wireshark-plugins
Any compatible wireshark version has left the tree so drop all that
cruft with bogus cmake.eclass usage.
Bug: https://bugs.gentoo.org/789234
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/libbtbb/libbtbb-9999.ebuild | 118 +----------------------------------
1 file changed, 1 insertion(+), 117 deletions(-)
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index fbdd1cde9c2c..9085d00e99ef 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -21,128 +21,12 @@ fi
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
- wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
-"
-DEPEND="${RDEPEND}
- wireshark-plugins? ( dev-libs/glib )
-"
-BDEPEND="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-2.2.0'; then
- plugins=""
- elif has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btbredr"
- 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_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
- 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_src_prepare
- done
- fi
-}
+IUSE="static-libs"
src_configure() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
local mycmakeargs=(
-DENABLE_PYTHON=OFF
-DBUILD_STATIC_LIB=$(usex static-libs)
)
cmake_src_configure
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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)"
- )
- cmake_src_configure
- done
- fi
-}
-
-src_compile() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_compile
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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_src_compile
- done
- fi
-}
-
-src_test() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_test
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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_src_test
- done
- fi
-}
-
-src_install() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_install
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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_src_install
- done
- fi
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2022-01-10 16:03 Andreas Sturmlechner
0 siblings, 0 replies; 34+ messages in thread
From: Andreas Sturmlechner @ 2022-01-10 16:03 UTC (permalink / raw
To: gentoo-commits
commit: eb31f363f575212412c4e6300ac1f392a14467db
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 9 20:16:14 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 16:03:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb31f363
net-libs/libbtbb: ENABLE_PYTHON=OFF so BUILD_ROOT is never used
Fixes forbidden ${ED} usage.
Bug: https://bugs.gentoo.org/659382
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/libbtbb/libbtbb-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 07ebc4c4767b..fbdd1cde9c2c 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -70,7 +70,6 @@ src_configure() {
local mycmakeargs=(
-DENABLE_PYTHON=OFF
-DBUILD_STATIC_LIB=$(usex static-libs)
- -DBUILD_ROOT="${ED}"
)
cmake_src_configure
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2022-01-10 16:03 Andreas Sturmlechner
0 siblings, 0 replies; 34+ messages in thread
From: Andreas Sturmlechner @ 2022-01-10 16:03 UTC (permalink / raw
To: gentoo-commits
commit: 454348fda51294a3baa82e9d1f51a0e1e35bf4f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 9 20:23:56 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 16:03:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=454348fd
net-libs/libbtbb: Drop 2018.08.1 and libbtbb-2020.12.1-r0
Both overshadowed by newer arch/~arch versions.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/libbtbb/Manifest | 1 -
net-libs/libbtbb/libbtbb-2018.08.1.ebuild | 150 ------------------------------
net-libs/libbtbb/libbtbb-2020.12.1.ebuild | 150 ------------------------------
3 files changed, 301 deletions(-)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index db5113ea61af..759d58316bf9 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,3 +1,2 @@
-DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b SHA512 a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
deleted file mode 100644
index 23524a6f4e36..000000000000
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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
-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 -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs 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-2.2.0'; then
- plugins=""
- elif has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btbredr"
- 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
- 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
- fi
-}
-
-src_configure() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- local mycmakeargs=(
- -DENABLE_PYTHON=OFF
- -DBUILD_STATIC_LIB=$(usex static-libs)
- -DBUILD_ROOT="${ED}"
- )
- cmake-utils_src_configure
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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)"
- )
- 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
- 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
- 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
- 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
- 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
- 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
- fi
-}
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
deleted file mode 100644
index edbf18eed8ff..000000000000
--- a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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
-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 -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs 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-2.2.0'; then
- plugins=""
- elif has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btbredr"
- 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_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
- 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_src_prepare
- done
- fi
-}
-
-src_configure() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- local mycmakeargs=(
- -DENABLE_PYTHON=OFF
- -DBUILD_STATIC_LIB=$(usex static-libs)
- -DBUILD_ROOT="${ED}"
- )
- cmake_src_configure
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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)"
- )
- cmake_src_configure
- done
- fi
-}
-
-src_compile() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_compile
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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_src_compile
- done
- fi
-}
-
-src_test() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_test
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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_src_test
- done
- fi
-}
-
-src_install() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- cmake_src_install
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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_src_install
- done
- fi
-}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2022-01-10 16:03 Andreas Sturmlechner
0 siblings, 0 replies; 34+ messages in thread
From: Andreas Sturmlechner @ 2022-01-10 16:03 UTC (permalink / raw
To: gentoo-commits
commit: b3f6295f467a0d1ae2e48938a58bb575f02b36af
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 9 20:11:39 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 16:03:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3f6295f
net-libs/libbtbb: EAPI-8 bump, style fixes, HOMEPAGE, indentation
Bug: https://bugs.gentoo.org/789234
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/libbtbb/libbtbb-9999.ebuild | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index edbf18eed8ff..07ebc4c4767b 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
+DESCRIPTION="Library to decode Bluetooth baseband packets"
+HOMEPAGE="https://github.com/greatscottgadgets/libbtbb"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
inherit git-r3
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 -> ${PN}-${MY_PV}.tar.gz"
+ S="${WORKDIR}"/${PN}-${MY_PV}
KEYWORDS="~amd64 ~arm ~x86"
fi
@@ -24,13 +24,12 @@ SLOT="0/${PV}"
IUSE="static-libs wireshark-plugins"
RDEPEND="
- wireshark-plugins? (
- >=net-analyzer/wireshark-1.8.3-r1:=
- )
+ wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
"
DEPEND="${RDEPEND}
- wireshark-plugins? ( dev-libs/glib
- virtual/pkgconfig )"
+ wireshark-plugins? ( dev-libs/glib )
+"
+BDEPEND="virtual/pkgconfig"
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2022-01-11 20:35 Arthur Zamarin
0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2022-01-11 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 554e81cb9aad200c8e11c6a06d7d536a8055b639
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 11 20:34:52 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 11 20:34:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554e81cb
net-libs/libbtbb: Stabilize 2020.12.1-r1 arm, #789234
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
index 9085d00e99ef..0d8971859373 100644
--- a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
@@ -16,7 +16,7 @@ else
MY_PV=${MY_PV/./-R}
SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
S="${WORKDIR}"/${PN}-${MY_PV}
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 arm ~x86"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2022-01-12 11:41 Jakov Smolić
0 siblings, 0 replies; 34+ messages in thread
From: Jakov Smolić @ 2022-01-12 11:41 UTC (permalink / raw
To: gentoo-commits
commit: 91f418c6ccc077a41fe724dac212cf1614e82d7f
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 11:40:56 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 11:40:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f418c6
net-libs/libbtbb: Stabilize 2020.12.1-r1 amd64, #789234
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
index 0d8971859373..b26312b26698 100644
--- a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
@@ -16,7 +16,7 @@ else
MY_PV=${MY_PV/./-R}
SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
S="${WORKDIR}"/${PN}-${MY_PV}
- KEYWORDS="~amd64 arm ~x86"
+ KEYWORDS="amd64 arm ~x86"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2022-01-12 11:41 Jakov Smolić
0 siblings, 0 replies; 34+ messages in thread
From: Jakov Smolić @ 2022-01-12 11:41 UTC (permalink / raw
To: gentoo-commits
commit: 16fa49554b6cc272cf55905ed9552b4347ea19c5
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 11:41:24 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 11:41:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16fa4955
net-libs/libbtbb: Stabilize 2020.12.1-r1 x86, #789234
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
index b26312b26698..c6a7e694e720 100644
--- a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
@@ -16,7 +16,7 @@ else
MY_PV=${MY_PV/./-R}
SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
S="${WORKDIR}"/${PN}-${MY_PV}
- KEYWORDS="amd64 arm ~x86"
+ KEYWORDS="amd64 arm x86"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2022-01-12 16:14 Andreas Sturmlechner
0 siblings, 0 replies; 34+ messages in thread
From: Andreas Sturmlechner @ 2022-01-12 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 6c6f895046647103f7bd7ad765a4705dbd19170f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 12:43:35 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 16:12:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6f8950
net-libs/libbtbb: Drop 2018.12.1, EAPI6--
Closes: https://bugs.gentoo.org/789234
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/libbtbb/Manifest | 1 -
net-libs/libbtbb/libbtbb-2018.12.1.ebuild | 150 ------------------------------
net-libs/libbtbb/metadata.xml | 3 -
3 files changed, 154 deletions(-)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 759d58316bf9..512e1bc72a5e 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,2 +1 @@
-DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b SHA512 a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
deleted file mode 100644
index f4a117ca3006..000000000000
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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
-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 -> ${PN}-${MY_PV}.tar.gz"
- KEYWORDS="amd64 arm x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs 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-2.2.0'; then
- plugins=""
- elif has_version '>=net-analyzer/wireshark-1.12.0'; then
- plugins="btbb btbredr"
- 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
- 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
- fi
-}
-
-src_configure() {
- CMAKE_USE_DIR="${S}"
- BUILD_DIR="${S}"_build
- local mycmakeargs=(
- -DENABLE_PYTHON=OFF
- -DBUILD_STATIC_LIB=$(usex static-libs)
- -DBUILD_ROOT="${ED}"
- )
- cmake-utils_src_configure
-
- if use wireshark-plugins; then
- for i in ${plugins}
- do
- 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)"
- )
- 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
- 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
- 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
- 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
- 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
- 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
- fi
-}
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index d7061daf597c..52a7dfec9b49 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -5,9 +5,6 @@
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
- <use>
- <flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
- </use>
<upstream>
<remote-id type="github">greatscottgadgets/libbtbb</remote-id>
<remote-id type="sourceforge">libbtbb</remote-id>
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
@ 2022-08-27 11:38 Sam James
0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-08-27 11:38 UTC (permalink / raw
To: gentoo-commits
commit: 95219ed7766b029cfbb2f30c5e7b8229bb78ac91
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Aug 22 12:13:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 11:38:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95219ed7
net-libs/libbtbb: remove sourceforge upstream metadata
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/26961
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/libbtbb/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index 52a7dfec9b49..ec9f500bb2e8 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -7,6 +7,5 @@
</maintainer>
<upstream>
<remote-id type="github">greatscottgadgets/libbtbb</remote-id>
- <remote-id type="sourceforge">libbtbb</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 34+ messages in thread
end of thread, other threads:[~2022-08-27 23:25 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-05 2:39 [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/ Richard Farina
-- strict thread matches above, loose matches on Subject: below --
2022-08-27 11:38 Sam James
2022-01-12 16:14 Andreas Sturmlechner
2022-01-12 11:41 Jakov Smolić
2022-01-12 11:41 Jakov Smolić
2022-01-11 20:35 Arthur Zamarin
2022-01-10 16:03 Andreas Sturmlechner
2022-01-10 16:03 Andreas Sturmlechner
2022-01-10 16:03 Andreas Sturmlechner
2022-01-10 16:03 Andreas Sturmlechner
2022-01-10 16:03 Andreas Sturmlechner
2021-03-30 23:27 Sam James
2021-03-30 20:20 Rick Farina
2021-03-30 20:20 Rick Farina
2021-01-07 3:00 Rick Farina
2020-09-01 9:07 Michał Górny
2020-07-05 13:44 Agostino Sarubbo
2020-07-05 13:38 Agostino Sarubbo
2020-07-05 13:36 Agostino Sarubbo
2019-03-20 2:25 Rick Farina
2018-08-07 23:10 Richard Farina
2018-01-11 16:06 Michał Górny
2018-01-11 16:02 Michał Górny
2017-03-20 17:07 Richard Farina
2017-03-04 5:08 Richard Farina
2017-03-04 5:06 Richard Farina
2016-02-03 23:00 Richard Farina
2016-02-02 17:53 Richard Farina
2016-01-22 3:17 Richard Farina
2016-01-22 3:17 Richard Farina
2015-09-22 2:36 Richard Farina
2015-09-05 2:39 Richard Farina
2015-09-04 16:35 Richard Farina
2015-08-28 15:42 Richard Farina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox