1 |
commit: fb07dedeee8c4298b3a74364cf0af872b93e7a81 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 8 06:47:01 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 16:46:36 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb07dede |
7 |
|
8 |
net-analyzer/net-snmp: Switch to PYTHON_MULTI_USEDEP API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
.../net-snmp/{net-snmp-5.8-r1.ebuild => net-snmp-5.8-r3.ebuild} | 6 ++++-- |
13 |
.../net-snmp/{net-snmp-5.8-r2.ebuild => net-snmp-5.8-r4.ebuild} | 6 ++++-- |
14 |
net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild | 6 ++++-- |
15 |
.../{net-snmp-5.8.1_pre1.ebuild => net-snmp-5.8.1_pre1-r1.ebuild} | 6 ++++-- |
16 |
net-analyzer/net-snmp/net-snmp-99999999.ebuild | 6 ++++-- |
17 |
5 files changed, 20 insertions(+), 10 deletions(-) |
18 |
|
19 |
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild |
20 |
similarity index 97% |
21 |
rename from net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild |
22 |
rename to net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild |
23 |
index 8c4fab7b689..4906c15987c 100644 |
24 |
--- a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild |
25 |
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild |
26 |
@@ -1,4 +1,4 @@ |
27 |
-# Copyright 1999-2019 Gentoo Authors |
28 |
+# Copyright 1999-2020 Gentoo Authors |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
|
31 |
EAPI=6 |
32 |
@@ -40,7 +40,9 @@ COMMON_DEPEND=" |
33 |
zlib? ( >=sys-libs/zlib-1.1.4 ) |
34 |
elf? ( dev-libs/elfutils ) |
35 |
python? ( |
36 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
37 |
+ $(python_gen_cond_dep ' |
38 |
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}] |
39 |
+ ') |
40 |
${PYTHON_DEPS} |
41 |
) |
42 |
pci? ( sys-apps/pciutils ) |
43 |
|
44 |
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild |
45 |
similarity index 97% |
46 |
rename from net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild |
47 |
rename to net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild |
48 |
index 119ec81687a..2470f847227 100644 |
49 |
--- a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild |
50 |
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild |
51 |
@@ -1,4 +1,4 @@ |
52 |
-# Copyright 1999-2019 Gentoo Authors |
53 |
+# Copyright 1999-2020 Gentoo Authors |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
|
56 |
EAPI=6 |
57 |
@@ -40,7 +40,9 @@ COMMON_DEPEND=" |
58 |
zlib? ( >=sys-libs/zlib-1.1.4 ) |
59 |
elf? ( dev-libs/elfutils ) |
60 |
python? ( |
61 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
62 |
+ $(python_gen_cond_dep ' |
63 |
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}] |
64 |
+ ') |
65 |
${PYTHON_DEPS} |
66 |
) |
67 |
pci? ( sys-apps/pciutils ) |
68 |
|
69 |
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild |
70 |
index 2b3f66b5294..e1fa13504cf 100644 |
71 |
--- a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild |
72 |
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild |
73 |
@@ -1,4 +1,4 @@ |
74 |
-# Copyright 1999-2019 Gentoo Authors |
75 |
+# Copyright 1999-2020 Gentoo Authors |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
|
78 |
EAPI=6 |
79 |
@@ -39,7 +39,9 @@ COMMON_DEPEND=" |
80 |
pci? ( sys-apps/pciutils ) |
81 |
perl? ( dev-lang/perl:= ) |
82 |
python? ( |
83 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
84 |
+ $(python_gen_cond_dep ' |
85 |
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}] |
86 |
+ ') |
87 |
${PYTHON_DEPS} |
88 |
) |
89 |
rpm? ( |
90 |
|
91 |
diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild |
92 |
similarity index 97% |
93 |
rename from net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild |
94 |
rename to net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild |
95 |
index 0704a753212..d853e1f035c 100644 |
96 |
--- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild |
97 |
+++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild |
98 |
@@ -1,4 +1,4 @@ |
99 |
-# Copyright 1999-2019 Gentoo Authors |
100 |
+# Copyright 1999-2020 Gentoo Authors |
101 |
# Distributed under the terms of the GNU General Public License v2 |
102 |
|
103 |
EAPI=7 |
104 |
@@ -43,7 +43,9 @@ COMMON_DEPEND=" |
105 |
pci? ( sys-apps/pciutils ) |
106 |
perl? ( dev-lang/perl:= ) |
107 |
python? ( |
108 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
109 |
+ $(python_gen_cond_dep ' |
110 |
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}] |
111 |
+ ') |
112 |
${PYTHON_DEPS} |
113 |
) |
114 |
rpm? ( |
115 |
|
116 |
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild |
117 |
index 901356c5a93..12ca0cc534b 100644 |
118 |
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild |
119 |
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild |
120 |
@@ -1,4 +1,4 @@ |
121 |
-# Copyright 1999-2019 Gentoo Authors |
122 |
+# Copyright 1999-2020 Gentoo Authors |
123 |
# Distributed under the terms of the GNU General Public License v2 |
124 |
|
125 |
EAPI=7 |
126 |
@@ -41,7 +41,9 @@ COMMON_DEPEND=" |
127 |
pci? ( sys-apps/pciutils ) |
128 |
perl? ( dev-lang/perl:= ) |
129 |
python? ( |
130 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
131 |
+ $(python_gen_cond_dep ' |
132 |
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}] |
133 |
+ ') |
134 |
${PYTHON_DEPS} |
135 |
) |
136 |
rpm? ( |