| 1 |
commit: 9d34496cb2ed2d805f5a7ec75b1cac17fbf92d75 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 17:47:22 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:34:30 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d34496c |
| 7 |
|
| 8 |
net-wireless/kismet: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
...t-2019.09.1-r1.ebuild => kismet-2019.09.1-r2.ebuild} | 10 +++++++--- |
| 13 |
...smet-2019.12.2.ebuild => kismet-2019.12.2-r1.ebuild} | 17 +++++++++++++---- |
| 14 |
net-wireless/kismet/kismet-9999.ebuild | 17 +++++++++++++---- |
| 15 |
3 files changed, 33 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-wireless/kismet/kismet-2019.09.1-r1.ebuild b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild |
| 18 |
similarity index 95% |
| 19 |
rename from net-wireless/kismet/kismet-2019.09.1-r1.ebuild |
| 20 |
rename to net-wireless/kismet/kismet-2019.09.1-r2.ebuild |
| 21 |
index 01ac8b25a82..178c532ebfb 100644 |
| 22 |
--- a/net-wireless/kismet/kismet-2019.09.1-r1.ebuild |
| 23 |
+++ b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2019 Gentoo Authors |
| 26 |
+# Copyright 1999-2020 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
@@ -51,7 +51,9 @@ CDEPEND=" |
| 31 |
mousejack? ( virtual/libusb:1 ) |
| 32 |
dev-libs/protobuf-c:= |
| 33 |
dev-libs/protobuf:= |
| 34 |
- dev-python/protobuf-python[${PYTHON_USEDEP}] |
| 35 |
+ $(python_gen_cond_dep ' |
| 36 |
+ dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] |
| 37 |
+ ') |
| 38 |
sys-libs/ncurses:= |
| 39 |
lm-sensors? ( sys-apps/lm-sensors ) |
| 40 |
pcre? ( dev-libs/libpcre ) |
| 41 |
@@ -63,7 +65,9 @@ DEPEND="${CDEPEND} |
| 42 |
" |
| 43 |
|
| 44 |
RDEPEND="${CDEPEND} |
| 45 |
- dev-python/pyserial[${PYTHON_USEDEP}] |
| 46 |
+ $(python_gen_cond_dep ' |
| 47 |
+ dev-python/pyserial[${PYTHON_MULTI_USEDEP}] |
| 48 |
+ ') |
| 49 |
selinux? ( sec-policy/selinux-kismet ) |
| 50 |
" |
| 51 |
|
| 52 |
|
| 53 |
diff --git a/net-wireless/kismet/kismet-2019.12.2.ebuild b/net-wireless/kismet/kismet-2019.12.2-r1.ebuild |
| 54 |
similarity index 94% |
| 55 |
rename from net-wireless/kismet/kismet-2019.12.2.ebuild |
| 56 |
rename to net-wireless/kismet/kismet-2019.12.2-r1.ebuild |
| 57 |
index 2a02da5e424..73b8a86810b 100644 |
| 58 |
--- a/net-wireless/kismet/kismet-2019.12.2.ebuild |
| 59 |
+++ b/net-wireless/kismet/kismet-2019.12.2-r1.ebuild |
| 60 |
@@ -51,7 +51,9 @@ CDEPEND=" |
| 61 |
libusb? ( virtual/libusb:1 ) |
| 62 |
dev-libs/protobuf-c:= |
| 63 |
dev-libs/protobuf:= |
| 64 |
- dev-python/protobuf-python[${PYTHON_USEDEP}] |
| 65 |
+ $(python_gen_cond_dep ' |
| 66 |
+ dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] |
| 67 |
+ ') |
| 68 |
sys-libs/ncurses:= |
| 69 |
lm-sensors? ( sys-apps/lm-sensors ) |
| 70 |
pcre? ( dev-libs/libpcre ) |
| 71 |
@@ -64,11 +66,18 @@ DEPEND="${CDEPEND} |
| 72 |
" |
| 73 |
|
| 74 |
RDEPEND="${CDEPEND} |
| 75 |
- dev-python/pyserial[${PYTHON_USEDEP}] |
| 76 |
+ $(python_gen_cond_dep ' |
| 77 |
+ dev-python/pyserial[${PYTHON_MULTI_USEDEP}] |
| 78 |
+ ') |
| 79 |
selinux? ( sec-policy/selinux-kismet ) |
| 80 |
" |
| 81 |
-PDEPEND="rtlsdr? ( dev-python/numpy[${PYTHON_USEDEP}] |
| 82 |
- net-wireless/rtl-sdr )" |
| 83 |
+PDEPEND=" |
| 84 |
+ rtlsdr? ( |
| 85 |
+ $(python_gen_cond_dep ' |
| 86 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 87 |
+ ') |
| 88 |
+ net-wireless/rtl-sdr |
| 89 |
+ )" |
| 90 |
|
| 91 |
src_prepare() { |
| 92 |
sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ |
| 93 |
|
| 94 |
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild |
| 95 |
index 2a02da5e424..73b8a86810b 100644 |
| 96 |
--- a/net-wireless/kismet/kismet-9999.ebuild |
| 97 |
+++ b/net-wireless/kismet/kismet-9999.ebuild |
| 98 |
@@ -51,7 +51,9 @@ CDEPEND=" |
| 99 |
libusb? ( virtual/libusb:1 ) |
| 100 |
dev-libs/protobuf-c:= |
| 101 |
dev-libs/protobuf:= |
| 102 |
- dev-python/protobuf-python[${PYTHON_USEDEP}] |
| 103 |
+ $(python_gen_cond_dep ' |
| 104 |
+ dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] |
| 105 |
+ ') |
| 106 |
sys-libs/ncurses:= |
| 107 |
lm-sensors? ( sys-apps/lm-sensors ) |
| 108 |
pcre? ( dev-libs/libpcre ) |
| 109 |
@@ -64,11 +66,18 @@ DEPEND="${CDEPEND} |
| 110 |
" |
| 111 |
|
| 112 |
RDEPEND="${CDEPEND} |
| 113 |
- dev-python/pyserial[${PYTHON_USEDEP}] |
| 114 |
+ $(python_gen_cond_dep ' |
| 115 |
+ dev-python/pyserial[${PYTHON_MULTI_USEDEP}] |
| 116 |
+ ') |
| 117 |
selinux? ( sec-policy/selinux-kismet ) |
| 118 |
" |
| 119 |
-PDEPEND="rtlsdr? ( dev-python/numpy[${PYTHON_USEDEP}] |
| 120 |
- net-wireless/rtl-sdr )" |
| 121 |
+PDEPEND=" |
| 122 |
+ rtlsdr? ( |
| 123 |
+ $(python_gen_cond_dep ' |
| 124 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 125 |
+ ') |
| 126 |
+ net-wireless/rtl-sdr |
| 127 |
+ )" |
| 128 |
|
| 129 |
src_prepare() { |
| 130 |
sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ |
Archives