[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/, net-libs/libbtbb/files/
commit: e0f44742d199c1806c2d1d6d0497f75fb65b2b9c Author: brahmajit das protonmail com> AuthorDate: Tue Aug 23 20:42:53 2022 + Commit: Sam James gentoo org> CommitDate: Thu Sep 1 02:05:39 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f44742 net-libs/libbtbb: Fix unknown type u_char on musl Build fails with error: unknown type name u_char Closes: https://bugs.gentoo.org/829245 Closes: https://bugs.gentoo.org/715758 Signed-off-by: brahmajit das protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/26549 Signed-off-by: Sam James gentoo.org> net-libs/libbtbb/files/libbtbb-2020.12.1-musl-u-char.patch | 14 ++ net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild | 4 2 files changed, 18 insertions(+) diff --git a/net-libs/libbtbb/files/libbtbb-2020.12.1-musl-u-char.patch b/net-libs/libbtbb/files/libbtbb-2020.12.1-musl-u-char.patch new file mode 100644 index ..7065e000477d --- /dev/null +++ b/net-libs/libbtbb/files/libbtbb-2020.12.1-musl-u-char.patch @@ -0,0 +1,14 @@ +# Fix unknown type name 'u_char' on musl +# Closes: https://bugs.gentoo.org/829245 +# Closes: https://bugs.gentoo.org/715758 +# Upstream PR: https://github.com/greatscottgadgets/libbtbb/pull/64 +--- a/lib/src/pcap.c b/lib/src/pcap.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + typedef enum { + PCAP_OK = 0, diff --git a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild index c6a7e694e720..ccc78dfda1b0 100644 --- a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild +++ b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild @@ -23,6 +23,10 @@ LICENSE="GPL-2" SLOT="0/${PV}" IUSE="static-libs" +PATCHES=( + "${FILESDIR}"/${PN}-2020.12.1-musl-u-char.patch +) + src_configure() { local mycmakeargs=( -DENABLE_PYTHON=OFF
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 95219ed7766b029cfbb2f30c5e7b8229bb78ac91 Author: Petr Vaněk atlas cz> AuthorDate: Mon Aug 22 12:13:27 2022 + Commit: Sam James gentoo org> CommitDate: Sat Aug 27 11:38:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95219ed7 net-libs/libbtbb: remove sourceforge upstream metadata Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/26961 Signed-off-by: Sam James 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 @@ greatscottgadgets/libbtbb - libbtbb
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 6c6f895046647103f7bd7ad765a4705dbd19170f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 12 12:43:35 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 12 16:12:14 2022 + 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 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.. --- 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} == "" ]] ; 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-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 -
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 16fa49554b6cc272cf55905ed9552b4347ea19c5 Author: Jakov Smolić gentoo org> AuthorDate: Wed Jan 12 11:41:24 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Jan 12 11:41:24 2022 + 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ć 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"
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 91f418c6ccc077a41fe724dac212cf1614e82d7f Author: Jakov Smolić gentoo org> AuthorDate: Wed Jan 12 11:40:56 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Jan 12 11:40:56 2022 + 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ć 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"
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 554e81cb9aad200c8e11c6a06d7d536a8055b639 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Jan 11 20:34:52 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Jan 11 20:34:52 2022 + 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 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"
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: b3f6295f467a0d1ae2e48938a58bb575f02b36af Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 9 20:11:39 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 10 16:03:27 2022 + 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 gentoo.org> net-libs/libbtbb/libbtbb-.ebuild | 21 ++--- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/net-libs/libbtbb/libbtbb-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index edbf18eed8ff..07ebc4c4767b 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.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} == "" ]] ; then +if [[ ${PV} == ** ]] ; 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}; }
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 75cc60a219910a9240526b00a23adb600852fe79 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 9 20:18:28 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 10 16:03:28 2022 + 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 gentoo.org> net-libs/libbtbb/libbtbb-.ebuild | 118 +-- 1 file changed, 1 insertion(+), 117 deletions(-) diff --git a/net-libs/libbtbb/libbtbb-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index fbdd1cde9c2c..9085d00e99ef 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.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-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 }
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 454348fda51294a3baa82e9d1f51a0e1e35bf4f0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 9 20:23:56 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 10 16:03:29 2022 + 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 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.. --- 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} == "" ]] ; 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-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 -
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 6255cd60a0ce21c07373ec6a9f2b834329c34572 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 9 20:21:27 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 10 16:03:28 2022 + 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 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 ..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} == ** ]] ; 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 +}
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: eb31f363f575212412c4e6300ac1f392a14467db Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 9 20:16:14 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 10 16:03:28 2022 + 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 gentoo.org> net-libs/libbtbb/libbtbb-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/net-libs/libbtbb/libbtbb-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index 07ebc4c4767b..fbdd1cde9c2c 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.ebuild @@ -70,7 +70,6 @@ src_configure() { local mycmakeargs=( -DENABLE_PYTHON=OFF -DBUILD_STATIC_LIB=$(usex static-libs) - -DBUILD_ROOT="${ED}" ) cmake_src_configure
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: e44e1ccc95b08bca1f9d1fa356bf5a123ffcc82c Author: Sam James gentoo org> AuthorDate: Tue Mar 30 23:26:30 2021 + Commit: Sam James gentoo org> CommitDate: Tue Mar 30 23:26:30 2021 + 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 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 000..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} == "" ]] ; 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-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 +
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 926f35c93c331860b759a883674e596e1f0c152f Author: Rick Farina gentoo org> AuthorDate: Tue Mar 30 20:17:25 2021 + Commit: Rick Farina gentoo org> CommitDate: Tue Mar 30 20:17:25 2021 + 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 gentoo.org> net-libs/libbtbb/libbtbb-2020.12.1.ebuild | 24 net-libs/libbtbb/libbtbb-.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-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index a1587cd739a..6db493027e1 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.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}
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 9820e1418912ba9d7723b9caa66462bfe7396940 Author: Rick Farina gentoo org> AuthorDate: Tue Mar 30 20:18:38 2021 + Commit: Rick Farina gentoo org> CommitDate: Tue Mar 30 20:18:38 2021 + 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 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..000 --- 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} == "" ]] ; 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-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 -
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: f30bf3ec75bbbc8ba7cd8e6dd5085bc731a2966e Author: Rick Farina gentoo org> AuthorDate: Thu Jan 7 02:59:09 2021 + Commit: Rick Farina gentoo org> CommitDate: Thu Jan 7 02:59:26 2021 + 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 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 000..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} == "" ]] ; 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-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 +
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 3f7eab9ae999cfd31debc0a9ebe822ed0fb375e7 Author: Michał Górny gentoo org> AuthorDate: Tue Sep 1 08:29:13 2020 + Commit: Michał Górny gentoo org> CommitDate: Tue Sep 1 09:06:59 2020 + 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 gentoo.org> net-libs/libbtbb/libbtbb-2018.08.1.ebuild | 13 - net-libs/libbtbb/libbtbb-2018.12.1.ebuild | 13 - net-libs/libbtbb/libbtbb-.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-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index ee2dca3e96c..a1587cd739a 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.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 ---
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 2817818efb43d37c3de5df0c02e06eb5a74766e2 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 5 13:43:16 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 5 13:43:16 2020 + 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 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"
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 38e850cf5133f9feb6437c8ae8cc3899e2ec3795 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 5 13:37:46 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 5 13:37:46 2020 + 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 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"
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: ad75fe8b29a32187626a6eb1fbf54898132df736 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 5 13:34:19 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 5 13:34:19 2020 + 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 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"
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 8bfe57467b6f6348dbded2ff14cbbbf3fbb156a9 Author: Rick Farina gentoo org> AuthorDate: Wed Mar 20 00:42:03 2019 + Commit: Rick Farina gentoo org> CommitDate: Wed Mar 20 02:25:28 2019 + 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 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-.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} == "" ]] ; 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} == "" ]] ; 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-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index b29bdf56932..0fa2d6551dd 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.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} == "" ]] ; then EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git; inherit git-r3 - KEYWORDS="" else MY_PV=${PV/\./-} MY_PV=${MY_PV/./-R}
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 51c9c9b82e3b44113d39097189bd4f36cc081fc7 Author: Zero_Chaos gentoo org> AuthorDate: Tue Aug 7 23:09:16 2018 + Commit: Richard Farina gentoo org> CommitDate: Tue Aug 7 23:10:33 2018 + 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 000..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} == "" ]] ; 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-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 +
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 5ef2e9167c4b021a5268767952d4e6f53e0d66d4 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 11 16:03:40 2018 + Commit: Michał Górny gentoo org> CommitDate: Thu Jan 11 16:05:57 2018 + 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 @@ Install pcapdump and btaptap tools - Add support for network packet capture via net-libs/libpcap Build the wireshark plugins for bluetooth baseband sniffing
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 26cba9895716c8dd9462241105d96c440678ecff Author: Michał Górny gentoo org> AuthorDate: Thu Jan 11 16:01:26 2018 + Commit: Michał Górny gentoo org> CommitDate: Thu Jan 11 16:02:14 2018 + 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..000 --- 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} == "" ]] ; 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 '
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: ac1586a4cd3bf09520bf88375e71037f26e37ae5 Author: Zero_Chaos gentoo org> AuthorDate: Mon Mar 20 17:05:11 2017 + Commit: Richard Farina gentoo org> CommitDate: Mon Mar 20 17:06:45 2017 + 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
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: b443bbd5e82ad5e28df7a6b90574bf4886e5ca47 Author: Zero_Chaos gentoo org> AuthorDate: Sat Mar 4 05:08:27 2017 + Commit: Richard Farina gentoo org> CommitDate: Sat Mar 4 05:08:27 2017 + 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-.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-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index 9fda2336a37..b29bdf56932 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.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? (
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 0e2c95a78f492892c5b862445365773036f90766 Author: Zero_Chaos gentoo org> AuthorDate: Sat Mar 4 04:59:01 2017 + Commit: Richard Farina gentoo org> CommitDate: Sat Mar 4 05:06:09 2017 + 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-.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-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
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: fea17bf34244da2b10bf5af0b8257034867a0ba4 Author: Zero_Chaos gentoo org> AuthorDate: Tue Feb 2 17:52:53 2016 + Commit: Richard Farina gentoo org> CommitDate: Tue Feb 2 17:53:10 2016 + 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-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net-libs/libbtbb/libbtbb-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index 437a5c9..d010cc0 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.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
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 983c6cb7293ccd7b01bf09f7813c599c5bbb88ac Author: Zero_Chaos gentoo org> AuthorDate: Fri Jan 22 03:07:51 2016 + Commit: Richard Farina gentoo org> CommitDate: Fri Jan 22 03:07:58 2016 + 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-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-libs/libbtbb/libbtbb-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index f200128..437a5c9 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.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$
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 543eb42f3aafad30ceb50598f7816a8cda945a34 Author: Zero_Chaos gentoo org> AuthorDate: Fri Jan 22 03:07:17 2016 + Commit: Richard Farina gentoo org> CommitDate: Fri Jan 22 03:07:17 2016 + 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-.ebuild | 31 +-- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/net-libs/libbtbb/libbtbb-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index 3d12be1..f200128 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.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
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 433de74a2dff50ec3f7660453a7cb35ead4fb5c4 Author: Zero_Chaos gentoo org> AuthorDate: Tue Sep 22 02:36:10 2015 + Commit: Richard Farina gentoo org> CommitDate: Tue Sep 22 02:36:49 2015 + 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
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/, net-wireless/ubertooth/, net-wireless/kismet-ubertooth/
commit: 6de4e36846c583f1188325c6a424c5acadee8c4a Author: Zero_Chaos gentoo org> AuthorDate: Sun Sep 6 21:25:35 2015 + Commit: Richard Farina gentoo org> CommitDate: Sun Sep 6 21:25:53 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de4e368 net-libs/libbtbb;net-wireless/{kismet-,}ubertooth: new release, plus rx_only firmware net-libs/libbtbb/Manifest | 2 +- .../libbtbb/{libbtbb-2015.09.1.ebuild => libbtbb-2015.09.2.ebuild}| 0 net-wireless/kismet-ubertooth/Manifest| 2 +- ...t-ubertooth-2015.09.1.ebuild => kismet-ubertooth-2015.09.2.ebuild} | 0 net-wireless/ubertooth/Manifest | 3 ++- .../{ubertooth-2015.09.1.ebuild => ubertooth-2015.09.2.ebuild}| 4 +++- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest index a537b80..a6cf815 100644 --- a/net-libs/libbtbb/Manifest +++ b/net-libs/libbtbb/Manifest @@ -1 +1 @@ -DIST libbtbb-2015-09-R1.tar.gz 222558 SHA256 6f68eae9f8504facce33c42ee790a4ba5dbc79d89564c9a10e9e25b6eb8328b1 SHA512 30b8e376fe4be0e0a5856256cff17f889f154ff7c76ab359cab3eb62bf7f3defc9bae00150a332954f10e60a5cbb84e0ae4595f5298fe235b8f6b252990b WHIRLPOOL 1805eb41f7cf4814c3d2f689157b22efd25f8a5dc12f2eb407d61487bd3d270bd630b3b9c54a8e65aa523a8538d61405661267fdffc1975b42ebd4b4b6f4d84c +DIST libbtbb-2015-09-R2.tar.gz 222045 SHA256 35ce44636649163f0d9a4de5905f686470f54c79b408959760db8c8182853161 SHA512 e300ec09de34644a0cd2f4aba2fe0b03021aaa0b0fe5035022f1e698ff10867adfd84850d0d40e9c070fbd622efee1b614221c1f5b1818f1d4f5d58cc3f31919 WHIRLPOOL 99d8c621b263cd3cd82e423eabff21d4979b0407c31430aa26424d273c9e3ed802e68833e3a100588a46a9a2126a84d0be56e41c1b609ea2eed4a3d64203c995 diff --git a/net-libs/libbtbb/libbtbb-2015.09.1.ebuild b/net-libs/libbtbb/libbtbb-2015.09.2.ebuild similarity index 100% rename from net-libs/libbtbb/libbtbb-2015.09.1.ebuild rename to net-libs/libbtbb/libbtbb-2015.09.2.ebuild diff --git a/net-wireless/kismet-ubertooth/Manifest b/net-wireless/kismet-ubertooth/Manifest index 9da99db..22b1af3 100644 --- a/net-wireless/kismet-ubertooth/Manifest +++ b/net-wireless/kismet-ubertooth/Manifest @@ -1 +1 @@ -DIST ubertooth-2015-09-R1.tar.xz 1707712 SHA256 3d02e3a2e2d000583c62c47a7745db0ab676266dfdf6f89bfaa3e7a141f90bf1 SHA512 a56070fa5da545b0cfa0ac65b6f537e8f27fab0da0fc4ac73e11456d52a58d1e2dbf71835083190dd4f3fe90dc36487ba0aa4ceb0b4a66e07d41e438e339d9e3 WHIRLPOOL 6e14447f5bbc87771d582e0fe77ae0abab39942cb921f3996700e2f7fac4e43c11891136e7097cf45ff08ceac290f534022dd32eb153ed7150729c5f8296a0f3 +DIST ubertooth-2015-09-R2.tar.xz 1706712 SHA256 f2088c8c0e754df47dd8dbf604d5822bf5894b91e4505276c6f9e26b6a23b56d SHA512 240f6d682fe0addc05bb8ccf7eec931534449adfa9c1369b484aeac73d9bcaf75c211aeede21c6c219e363773ce3d63e4aa0ee6b662acc83409587bd7ac7e4da WHIRLPOOL 9fba78d1740efd342f3892ffc3cf914d1919ef1c7d282786a64afb72d6ed306dec3600363e3f85f2f70d9ccfba6b62f826a72942cb7c9316d151dd2718f79b09 diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.09.1.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.09.2.ebuild similarity index 100% rename from net-wireless/kismet-ubertooth/kismet-ubertooth-2015.09.1.ebuild rename to net-wireless/kismet-ubertooth/kismet-ubertooth-2015.09.2.ebuild diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest index 9da99db..0c78e62 100644 --- a/net-wireless/ubertooth/Manifest +++ b/net-wireless/ubertooth/Manifest @@ -1 +1,2 @@ -DIST ubertooth-2015-09-R1.tar.xz 1707712 SHA256 3d02e3a2e2d000583c62c47a7745db0ab676266dfdf6f89bfaa3e7a141f90bf1 SHA512 a56070fa5da545b0cfa0ac65b6f537e8f27fab0da0fc4ac73e11456d52a58d1e2dbf71835083190dd4f3fe90dc36487ba0aa4ceb0b4a66e07d41e438e339d9e3 WHIRLPOOL 6e14447f5bbc87771d582e0fe77ae0abab39942cb921f3996700e2f7fac4e43c11891136e7097cf45ff08ceac290f534022dd32eb153ed7150729c5f8296a0f3 +DIST ubertooth-2015-09-R2.tar.xz 1706712 SHA256 f2088c8c0e754df47dd8dbf604d5822bf5894b91e4505276c6f9e26b6a23b56d SHA512 240f6d682fe0addc05bb8ccf7eec931534449adfa9c1369b484aeac73d9bcaf75c211aeede21c6c219e363773ce3d63e4aa0ee6b662acc83409587bd7ac7e4da WHIRLPOOL 9fba78d1740efd342f3892ffc3cf914d1919ef1c7d282786a64afb72d6ed306dec3600363e3f85f2f70d9ccfba6b62f826a72942cb7c9316d151dd2718f79b09 +DIST ubertooth_one_rx_only.dfu 32060 SHA256 fefc034ff19fa8b4b307d77c875bfeaa639e2aa0ecf8b8337e6424618480b1b5 SHA512 daeaeae90cb2aa591db2787466cbdc7365ce4e74ce5f7af4f61c9c1a22af93e846ea9230acca64f88a85a959d0db447b19da4dc4d213601db8dd1ad3d9978fa7 WHIRLPOOL 3069bf540c87d317e4f612b25ef4af10c3a9197ec9ead69082021442e0cc70d4b381488ba4bd509f75535a43f8f7b5fcebae313b96623513de846edb51cf63a0 diff --git a/net-wireless/ubertooth/ubertooth-2015.09.1.ebuild b/net-wireless/ubertooth/ubertooth-2015.09.2.ebuild similarity index 91% rename from net-wireless/ubertooth/ubertooth-2015.09.1.ebuild rename to
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 677636f1cdbcaedc2de96b8ddbf4bdf5b5c3ed7c Author: Zero_Chaos gentoo org> AuthorDate: Fri Sep 4 16:35:19 2015 + Commit: Richard Farina gentoo org> CommitDate: Fri Sep 4 16:35:19 2015 + 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-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-libs/libbtbb/libbtbb-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index 610eaab..3d12be1 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.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 '
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 3a8fcb7f972d9b29909e6a34ea8278b1d8b6c61c Author: Zero_Chaos gentoo org> AuthorDate: Sat Sep 5 02:32:28 2015 + Commit: Richard Farina gentoo org> CommitDate: Sat Sep 5 02:32:28 2015 + 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 30b8e376fe4be0e0a5856256cff17f889f154ff7c76ab359cab3eb62bf7f3defc9bae00150a332954f10e60a5cbb84e0ae4595f5298fe235b8f6b252990b 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..000 --- 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} == "" ]] ; 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 '
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 798a48d91a4f00a514836a537edff127cc173a6d Author: Zero_Chaos gentoo org> AuthorDate: Sat Sep 5 02:31:40 2015 + Commit: Richard Farina gentoo org> CommitDate: Sat Sep 5 02:31:48 2015 + 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 30b8e376fe4be0e0a5856256cff17f889f154ff7c76ab359cab3eb62bf7f3defc9bae00150a332954f10e60a5cbb84e0ae4595f5298fe235b8f6b252990b 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 000..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} == "" ]] ; 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 '
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: c0d5edc471fb4fddc39568b00d8e42e9ac7b0dee Author: Zero_Chaos zerochaos AT gentoo DOT org AuthorDate: Fri Aug 28 15:42:33 2015 + Commit: Richard Farina zerochaos AT gentoo DOT org CommitDate: Fri Aug 28 15:42:33 2015 + 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-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/net-libs/libbtbb/libbtbb-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index ef145c7..610eaab 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.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}