1 |
commit: 3f7eab9ae999cfd31debc0a9ebe822ed0fb375e7 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 1 08:29:13 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 1 09:06:59 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7eab9a |
7 |
|
8 |
net-libs/libbtbb: Remove USE=extras (python2) |
9 |
|
10 |
Closes: https://bugs.gentoo.org/735418 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
net-libs/libbtbb/libbtbb-2018.08.1.ebuild | 13 ++++--------- |
14 |
net-libs/libbtbb/libbtbb-2018.12.1.ebuild | 13 ++++--------- |
15 |
net-libs/libbtbb/libbtbb-9999.ebuild | 13 ++++--------- |
16 |
net-libs/libbtbb/metadata.xml | 1 - |
17 |
4 files changed, 12 insertions(+), 28 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild |
20 |
index ee2dca3e96c..a1587cd739a 100644 |
21 |
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild |
22 |
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild |
23 |
@@ -3,10 +3,7 @@ |
24 |
|
25 |
EAPI=6 |
26 |
|
27 |
-PYTHON_COMPAT=( python2_7 ) |
28 |
-DISTUTILS_OPTIONAL=1 |
29 |
- |
30 |
-inherit multilib cmake-utils python-single-r1 |
31 |
+inherit multilib cmake-utils |
32 |
|
33 |
DESCRIPTION="A library to decode Bluetooth baseband packets" |
34 |
HOMEPAGE="http://libbtbb.sourceforge.net/" |
35 |
@@ -24,9 +21,9 @@ fi |
36 |
|
37 |
LICENSE="GPL-2" |
38 |
SLOT="0/${PV}" |
39 |
-IUSE="extras static-libs wireshark-plugins" |
40 |
+IUSE="static-libs wireshark-plugins" |
41 |
|
42 |
-RDEPEND="extras? ( ${PYTHON_DEPS} ) |
43 |
+RDEPEND=" |
44 |
wireshark-plugins? ( |
45 |
>=net-analyzer/wireshark-1.8.3-r1:= |
46 |
) |
47 |
@@ -35,8 +32,6 @@ DEPEND="${RDEPEND} |
48 |
wireshark-plugins? ( dev-libs/glib |
49 |
virtual/pkgconfig )" |
50 |
|
51 |
-REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )" |
52 |
- |
53 |
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; } |
54 |
|
55 |
which_plugins() { |
56 |
@@ -74,7 +69,7 @@ src_configure() { |
57 |
CMAKE_USE_DIR="${S}" |
58 |
BUILD_DIR="${S}"_build |
59 |
local mycmakeargs=( |
60 |
- -DENABLE_PYTHON=$(usex extras) |
61 |
+ -DENABLE_PYTHON=OFF |
62 |
-DBUILD_STATIC_LIB=$(usex static-libs) |
63 |
-DBUILD_ROOT="${ED}" |
64 |
) |
65 |
|
66 |
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild |
67 |
index b2017354f2a..d3976d1260b 100644 |
68 |
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild |
69 |
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild |
70 |
@@ -3,10 +3,7 @@ |
71 |
|
72 |
EAPI=6 |
73 |
|
74 |
-PYTHON_COMPAT=( python2_7 ) |
75 |
-DISTUTILS_OPTIONAL=1 |
76 |
- |
77 |
-inherit multilib cmake-utils python-single-r1 |
78 |
+inherit multilib cmake-utils |
79 |
|
80 |
DESCRIPTION="A library to decode Bluetooth baseband packets" |
81 |
HOMEPAGE="http://libbtbb.sourceforge.net/" |
82 |
@@ -24,9 +21,9 @@ fi |
83 |
|
84 |
LICENSE="GPL-2" |
85 |
SLOT="0/${PV}" |
86 |
-IUSE="extras static-libs wireshark-plugins" |
87 |
+IUSE="static-libs wireshark-plugins" |
88 |
|
89 |
-RDEPEND="extras? ( ${PYTHON_DEPS} ) |
90 |
+RDEPEND=" |
91 |
wireshark-plugins? ( |
92 |
>=net-analyzer/wireshark-1.8.3-r1:= |
93 |
) |
94 |
@@ -35,8 +32,6 @@ DEPEND="${RDEPEND} |
95 |
wireshark-plugins? ( dev-libs/glib |
96 |
virtual/pkgconfig )" |
97 |
|
98 |
-REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )" |
99 |
- |
100 |
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; } |
101 |
|
102 |
which_plugins() { |
103 |
@@ -74,7 +69,7 @@ src_configure() { |
104 |
CMAKE_USE_DIR="${S}" |
105 |
BUILD_DIR="${S}"_build |
106 |
local mycmakeargs=( |
107 |
- -DENABLE_PYTHON=$(usex extras) |
108 |
+ -DENABLE_PYTHON=OFF |
109 |
-DBUILD_STATIC_LIB=$(usex static-libs) |
110 |
-DBUILD_ROOT="${ED}" |
111 |
) |
112 |
|
113 |
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild |
114 |
index ee2dca3e96c..a1587cd739a 100644 |
115 |
--- a/net-libs/libbtbb/libbtbb-9999.ebuild |
116 |
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild |
117 |
@@ -3,10 +3,7 @@ |
118 |
|
119 |
EAPI=6 |
120 |
|
121 |
-PYTHON_COMPAT=( python2_7 ) |
122 |
-DISTUTILS_OPTIONAL=1 |
123 |
- |
124 |
-inherit multilib cmake-utils python-single-r1 |
125 |
+inherit multilib cmake-utils |
126 |
|
127 |
DESCRIPTION="A library to decode Bluetooth baseband packets" |
128 |
HOMEPAGE="http://libbtbb.sourceforge.net/" |
129 |
@@ -24,9 +21,9 @@ fi |
130 |
|
131 |
LICENSE="GPL-2" |
132 |
SLOT="0/${PV}" |
133 |
-IUSE="extras static-libs wireshark-plugins" |
134 |
+IUSE="static-libs wireshark-plugins" |
135 |
|
136 |
-RDEPEND="extras? ( ${PYTHON_DEPS} ) |
137 |
+RDEPEND=" |
138 |
wireshark-plugins? ( |
139 |
>=net-analyzer/wireshark-1.8.3-r1:= |
140 |
) |
141 |
@@ -35,8 +32,6 @@ DEPEND="${RDEPEND} |
142 |
wireshark-plugins? ( dev-libs/glib |
143 |
virtual/pkgconfig )" |
144 |
|
145 |
-REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )" |
146 |
- |
147 |
get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; } |
148 |
|
149 |
which_plugins() { |
150 |
@@ -74,7 +69,7 @@ src_configure() { |
151 |
CMAKE_USE_DIR="${S}" |
152 |
BUILD_DIR="${S}"_build |
153 |
local mycmakeargs=( |
154 |
- -DENABLE_PYTHON=$(usex extras) |
155 |
+ -DENABLE_PYTHON=OFF |
156 |
-DBUILD_STATIC_LIB=$(usex static-libs) |
157 |
-DBUILD_ROOT="${ED}" |
158 |
) |
159 |
|
160 |
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml |
161 |
index 810dd5222c3..3127bca391a 100644 |
162 |
--- a/net-libs/libbtbb/metadata.xml |
163 |
+++ b/net-libs/libbtbb/metadata.xml |
164 |
@@ -6,7 +6,6 @@ |
165 |
<name>Rick Farina</name> |
166 |
</maintainer> |
167 |
<use> |
168 |
- <flag name="extras">Install pcapdump and btaptap tools</flag> |
169 |
<flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag> |
170 |
</use> |
171 |
<upstream> |