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>
