commit: 9d34496cb2ed2d805f5a7ec75b1cac17fbf92d75
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 17:47:22 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:34:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d34496c
net-wireless/kismet: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
...t-2019.09.1-r1.ebuild => kismet-2019.09.1-r2.ebuild} | 10 +++++++---
...smet-2019.12.2.ebuild => kismet-2019.12.2-r1.ebuild} | 17 +++++++++++++----
net-wireless/kismet/kismet-9999.ebuild | 17 +++++++++++++----
3 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/net-wireless/kismet/kismet-2019.09.1-r1.ebuild
b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild
similarity index 95%
rename from net-wireless/kismet/kismet-2019.09.1-r1.ebuild
rename to net-wireless/kismet/kismet-2019.09.1-r2.ebuild
index 01ac8b25a82..178c532ebfb 100644
--- a/net-wireless/kismet/kismet-2019.09.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -51,7 +51,9 @@ CDEPEND="
mousejack? ( virtual/libusb:1 )
dev-libs/protobuf-c:=
dev-libs/protobuf:=
- dev-python/protobuf-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+ ')
sys-libs/ncurses:=
lm-sensors? ( sys-apps/lm-sensors )
pcre? ( dev-libs/libpcre )
@@ -63,7 +65,9 @@ DEPEND="${CDEPEND}
"
RDEPEND="${CDEPEND}
- dev-python/pyserial[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+ ')
selinux? ( sec-policy/selinux-kismet )
"
diff --git a/net-wireless/kismet/kismet-2019.12.2.ebuild
b/net-wireless/kismet/kismet-2019.12.2-r1.ebuild
similarity index 94%
rename from net-wireless/kismet/kismet-2019.12.2.ebuild
rename to net-wireless/kismet/kismet-2019.12.2-r1.ebuild
index 2a02da5e424..73b8a86810b 100644
--- a/net-wireless/kismet/kismet-2019.12.2.ebuild
+++ b/net-wireless/kismet/kismet-2019.12.2-r1.ebuild
@@ -51,7 +51,9 @@ CDEPEND="
libusb? ( virtual/libusb:1 )
dev-libs/protobuf-c:=
dev-libs/protobuf:=
- dev-python/protobuf-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+ ')
sys-libs/ncurses:=
lm-sensors? ( sys-apps/lm-sensors )
pcre? ( dev-libs/libpcre )
@@ -64,11 +66,18 @@ DEPEND="${CDEPEND}
"
RDEPEND="${CDEPEND}
- dev-python/pyserial[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+ ')
selinux? ( sec-policy/selinux-kismet )
"
-PDEPEND="rtlsdr? ( dev-python/numpy[${PYTHON_USEDEP}]
- net-wireless/rtl-sdr )"
+PDEPEND="
+ rtlsdr? (
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
+ net-wireless/rtl-sdr
+ )"
src_prepare() {
sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
diff --git a/net-wireless/kismet/kismet-9999.ebuild
b/net-wireless/kismet/kismet-9999.ebuild
index 2a02da5e424..73b8a86810b 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -51,7 +51,9 @@ CDEPEND="
libusb? ( virtual/libusb:1 )
dev-libs/protobuf-c:=
dev-libs/protobuf:=
- dev-python/protobuf-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+ ')
sys-libs/ncurses:=
lm-sensors? ( sys-apps/lm-sensors )
pcre? ( dev-libs/libpcre )
@@ -64,11 +66,18 @@ DEPEND="${CDEPEND}
"
RDEPEND="${CDEPEND}
- dev-python/pyserial[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+ ')
selinux? ( sec-policy/selinux-kismet )
"
-PDEPEND="rtlsdr? ( dev-python/numpy[${PYTHON_USEDEP}]
- net-wireless/rtl-sdr )"
+PDEPEND="
+ rtlsdr? (
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
+ net-wireless/rtl-sdr
+ )"
src_prepare() {
sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
