Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Rick Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
Date: Tue, 30 Mar 2021 20:20:49
Message-Id: 1617135445.926f35c93c331860b759a883674e596e1f0c152f.zerochaos@gentoo
1 commit: 926f35c93c331860b759a883674e596e1f0c152f
2 Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 30 20:17:25 2021 +0000
4 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 30 20:17:25 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=926f35c9
7
8 net-libs/libbtbb: migrate off cmake-utils
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
12
13 net-libs/libbtbb/libbtbb-2020.12.1.ebuild | 24 ++++++++++++------------
14 net-libs/libbtbb/libbtbb-9999.ebuild | 26 +++++++++++++-------------
15 2 files changed, 25 insertions(+), 25 deletions(-)
16
17 diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
18 index 758b20c33cd..6db493027e1 100644
19 --- a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
20 +++ b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
21 @@ -1,9 +1,9 @@
22 # Copyright 1999-2021 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI=6
26 +EAPI=7
27
28 -inherit multilib cmake-utils
29 +inherit multilib cmake
30
31 DESCRIPTION="A library to decode Bluetooth baseband packets"
32 HOMEPAGE="http://libbtbb.sourceforge.net/"
33 @@ -47,7 +47,7 @@ which_plugins() {
34 src_prepare() {
35 CMAKE_USE_DIR="${S}"
36 BUILD_DIR="${S}"_build
37 - cmake-utils_src_prepare
38 + cmake_src_prepare
39
40 if use wireshark-plugins; then
41 which_plugins
42 @@ -60,7 +60,7 @@ src_prepare() {
43 CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
44 fi
45 BUILD_DIR="${WORKDIR}"/${i}_build
46 - cmake-utils_src_prepare
47 + cmake_src_prepare
48 done
49 fi
50 }
51 @@ -73,7 +73,7 @@ src_configure() {
52 -DBUILD_STATIC_LIB=$(usex static-libs)
53 -DBUILD_ROOT="${ED}"
54 )
55 - cmake-utils_src_configure
56 + cmake_src_configure
57
58 if use wireshark-plugins; then
59 for i in ${plugins}
60 @@ -87,7 +87,7 @@ src_configure() {
61 local mycmakeargs=(
62 -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
63 )
64 - cmake-utils_src_configure
65 + cmake_src_configure
66 done
67 fi
68 }
69 @@ -95,7 +95,7 @@ src_configure() {
70 src_compile() {
71 CMAKE_USE_DIR="${S}"
72 BUILD_DIR="${S}"_build
73 - cmake-utils_src_compile
74 + cmake_src_compile
75
76 if use wireshark-plugins; then
77 for i in ${plugins}
78 @@ -106,7 +106,7 @@ src_compile() {
79 CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
80 fi
81 BUILD_DIR="${WORKDIR}"/${i}_build
82 - cmake-utils_src_compile
83 + cmake_src_compile
84 done
85 fi
86 }
87 @@ -114,7 +114,7 @@ src_compile() {
88 src_test() {
89 CMAKE_USE_DIR="${S}"
90 BUILD_DIR="${S}"_build
91 - cmake-utils_src_test
92 + cmake_src_test
93
94 if use wireshark-plugins; then
95 for i in ${plugins}
96 @@ -125,7 +125,7 @@ src_test() {
97 CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
98 fi
99 BUILD_DIR="${WORKDIR}"/${i}_build
100 - cmake-utils_src_test
101 + cmake_src_test
102 done
103 fi
104 }
105 @@ -133,7 +133,7 @@ src_test() {
106 src_install() {
107 CMAKE_USE_DIR="${S}"
108 BUILD_DIR="${S}"_build
109 - cmake-utils_src_install
110 + cmake_src_install
111
112 if use wireshark-plugins; then
113 for i in ${plugins}
114 @@ -144,7 +144,7 @@ src_install() {
115 CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
116 fi
117 BUILD_DIR="${WORKDIR}"/${i}_build
118 - cmake-utils_src_install
119 + cmake_src_install
120 done
121 fi
122 }
123
124 diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
125 index a1587cd739a..6db493027e1 100644
126 --- a/net-libs/libbtbb/libbtbb-9999.ebuild
127 +++ b/net-libs/libbtbb/libbtbb-9999.ebuild
128 @@ -1,9 +1,9 @@
129 -# Copyright 1999-2020 Gentoo Authors
130 +# Copyright 1999-2021 Gentoo Authors
131 # Distributed under the terms of the GNU General Public License v2
132
133 -EAPI=6
134 +EAPI=7
135
136 -inherit multilib cmake-utils
137 +inherit multilib cmake
138
139 DESCRIPTION="A library to decode Bluetooth baseband packets"
140 HOMEPAGE="http://libbtbb.sourceforge.net/"
141 @@ -47,7 +47,7 @@ which_plugins() {
142 src_prepare() {
143 CMAKE_USE_DIR="${S}"
144 BUILD_DIR="${S}"_build
145 - cmake-utils_src_prepare
146 + cmake_src_prepare
147
148 if use wireshark-plugins; then
149 which_plugins
150 @@ -60,7 +60,7 @@ src_prepare() {
151 CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
152 fi
153 BUILD_DIR="${WORKDIR}"/${i}_build
154 - cmake-utils_src_prepare
155 + cmake_src_prepare
156 done
157 fi
158 }
159 @@ -73,7 +73,7 @@ src_configure() {
160 -DBUILD_STATIC_LIB=$(usex static-libs)
161 -DBUILD_ROOT="${ED}"
162 )
163 - cmake-utils_src_configure
164 + cmake_src_configure
165
166 if use wireshark-plugins; then
167 for i in ${plugins}
168 @@ -87,7 +87,7 @@ src_configure() {
169 local mycmakeargs=(
170 -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
171 )
172 - cmake-utils_src_configure
173 + cmake_src_configure
174 done
175 fi
176 }
177 @@ -95,7 +95,7 @@ src_configure() {
178 src_compile() {
179 CMAKE_USE_DIR="${S}"
180 BUILD_DIR="${S}"_build
181 - cmake-utils_src_compile
182 + cmake_src_compile
183
184 if use wireshark-plugins; then
185 for i in ${plugins}
186 @@ -106,7 +106,7 @@ src_compile() {
187 CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
188 fi
189 BUILD_DIR="${WORKDIR}"/${i}_build
190 - cmake-utils_src_compile
191 + cmake_src_compile
192 done
193 fi
194 }
195 @@ -114,7 +114,7 @@ src_compile() {
196 src_test() {
197 CMAKE_USE_DIR="${S}"
198 BUILD_DIR="${S}"_build
199 - cmake-utils_src_test
200 + cmake_src_test
201
202 if use wireshark-plugins; then
203 for i in ${plugins}
204 @@ -125,7 +125,7 @@ src_test() {
205 CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
206 fi
207 BUILD_DIR="${WORKDIR}"/${i}_build
208 - cmake-utils_src_test
209 + cmake_src_test
210 done
211 fi
212 }
213 @@ -133,7 +133,7 @@ src_test() {
214 src_install() {
215 CMAKE_USE_DIR="${S}"
216 BUILD_DIR="${S}"_build
217 - cmake-utils_src_install
218 + cmake_src_install
219
220 if use wireshark-plugins; then
221 for i in ${plugins}
222 @@ -144,7 +144,7 @@ src_install() {
223 CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
224 fi
225 BUILD_DIR="${WORKDIR}"/${i}_build
226 - cmake-utils_src_install
227 + cmake_src_install
228 done
229 fi
230 }
Report Message
Find on MARC Find on Google Groups