Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/qtermwidget/, app-editors/juffed/, x11-misc/qlipper/, x11-misc/qtfm/, ...
Date: Tue, 31 Dec 2019 14:38:20
Message-Id: 1577803045.0fce98f8426d4103340b14f22001be312a0a1b16.asturm@gentoo
1 commit: 0fce98f8426d4103340b14f22001be312a0a1b16
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 23 23:27:10 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 31 14:37:25 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fce98f8
7
8 */*: Switch qt proj packages to cmake.eclass
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 app-editors/juffed/juffed-0.10_p20160323-r1.ebuild | 6 +++---
13 app-emulation/q4wine/q4wine-1.3.11.ebuild | 4 ++--
14 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 8 ++++----
15 media-gfx/nomacs/nomacs-3.12.ebuild | 4 ++--
16 x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild | 2 +-
17 x11-libs/qtermwidget/qtermwidget-9999.ebuild | 2 +-
18 x11-misc/qlipper/qlipper-5.1.2.ebuild | 2 +-
19 x11-misc/qps/qps-1.10.20.ebuild | 2 +-
20 x11-misc/qtfm/qtfm-99999.ebuild | 4 ++--
21 x11-misc/screengrab/screengrab-1.101.ebuild | 2 +-
22 x11-terms/qterminal/qterminal-0.14.1.ebuild | 2 +-
23 x11-terms/qterminal/qterminal-9999.ebuild | 2 +-
24 12 files changed, 20 insertions(+), 20 deletions(-)
25
26 diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
27 index ef84d7ef461..955c950bbf9 100644
28 --- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
29 +++ b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
30 @@ -4,7 +4,7 @@
31 EAPI=7
32
33 COMMIT=5ba17f90ec173e773470bc80ea26bca9a3f093fd
34 -inherit cmake-utils xdg
35 +inherit cmake xdg
36
37 DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
38 HOMEPAGE="http://juffed.com/en/"
39 @@ -41,7 +41,7 @@ src_prepare() {
40 # Upstream version outdated/dysfunctional and CRLF terminated
41 cp "${FILESDIR}"/FindQtSingleApplication.cmake cmake/ || die
42
43 - cmake-utils_src_prepare
44 + cmake_src_prepare
45
46 sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die
47 }
48 @@ -54,5 +54,5 @@ src_configure() {
49 -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
50 -DLIB_SUFFIX=${libdir/lib/}
51 )
52 - cmake-utils_src_configure
53 + cmake_src_configure
54 }
55
56 diff --git a/app-emulation/q4wine/q4wine-1.3.11.ebuild b/app-emulation/q4wine/q4wine-1.3.11.ebuild
57 index d7e68124ce8..4604dd003e7 100644
58 --- a/app-emulation/q4wine/q4wine-1.3.11.ebuild
59 +++ b/app-emulation/q4wine/q4wine-1.3.11.ebuild
60 @@ -3,7 +3,7 @@
61
62 EAPI=7
63
64 -inherit xdg cmake-utils
65 +inherit xdg cmake
66
67 # Upstream names the package PV-rX. We change that to
68 # PV_pX so we can use portage revisions.
69 @@ -54,5 +54,5 @@ src_configure() {
70 -DUSE_GZIP=OFF
71 -DWITH_DBUS=$(usex dbus ON OFF)
72 )
73 - cmake-utils_src_configure
74 + cmake_src_configure
75 }
76
77 diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
78 index 196ec44e934..fc9fd9ccaf8 100644
79 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
80 +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
81 @@ -6,7 +6,7 @@ EAPI=7
82 PYTHON_COMPAT=( python2_7 )
83 USE_RUBY="ruby24 ruby25 ruby26"
84 MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous snapshot
85 -inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs
86 +inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs
87
88 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
89 HOMEPAGE="https://www.qt.io/"
90 @@ -116,7 +116,7 @@ src_configure() {
91 -DENABLE_PRINT_SUPPORT=$(usex printsupport)
92 -DENABLE_DEVICE_ORIENTATION=$(usex orientation)
93 -DENABLE_WEBKIT2=$(usex qml)
94 - $(cmake-utils_use_find_package webp WebP)
95 + $(cmake_use_find_package webp WebP)
96 -DENABLE_X11_TARGET=$(usex X)
97 )
98
99 @@ -128,11 +128,11 @@ src_configure() {
100 mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
101 fi
102
103 - cmake-utils_src_configure
104 + cmake_src_configure
105 }
106
107 src_install() {
108 - cmake-utils_src_install
109 + cmake_src_install
110
111 # bug 572056
112 if [[ ! -f ${ED}$(qt5_get_libdir)/libQt5WebKit.so ]]; then
113
114 diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.12.ebuild
115 index 17e8151bfcf..a527bc46b3e 100644
116 --- a/media-gfx/nomacs/nomacs-3.12.ebuild
117 +++ b/media-gfx/nomacs/nomacs-3.12.ebuild
118 @@ -3,7 +3,7 @@
119
120 EAPI=7
121
122 -inherit cmake-utils xdg-utils
123 +inherit cmake xdg-utils
124
125 DESCRIPTION="Qt-based image viewer"
126 HOMEPAGE="https://nomacs.org/"
127 @@ -57,7 +57,7 @@ src_configure() {
128 -DENABLE_TIFF=$(usex tiff)
129 -DENABLE_QUAZIP=$(usex zip)
130 )
131 - cmake-utils_src_configure
132 + cmake_src_configure
133 }
134
135 pkg_postinst() {
136
137 diff --git a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
138 index a4f168095b5..b7ed36058ef 100644
139 --- a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
140 +++ b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
141 @@ -3,7 +3,7 @@
142
143 EAPI=7
144
145 -inherit cmake-utils
146 +inherit cmake
147
148 DESCRIPTION="Qt terminal emulator widget"
149 HOMEPAGE="https://lxqt.org/"
150
151 diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
152 index 9c367cc15cb..e9a17c8f55c 100644
153 --- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
154 +++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
155 @@ -3,7 +3,7 @@
156
157 EAPI=7
158
159 -inherit cmake-utils
160 +inherit cmake
161
162 DESCRIPTION="Qt terminal emulator widget"
163 HOMEPAGE="https://lxqt.org/"
164
165 diff --git a/x11-misc/qlipper/qlipper-5.1.2.ebuild b/x11-misc/qlipper/qlipper-5.1.2.ebuild
166 index 412e6dbec0e..d4b0e226ba3 100644
167 --- a/x11-misc/qlipper/qlipper-5.1.2.ebuild
168 +++ b/x11-misc/qlipper/qlipper-5.1.2.ebuild
169 @@ -3,7 +3,7 @@
170
171 EAPI=7
172
173 -inherit cmake-utils xdg-utils
174 +inherit cmake xdg-utils
175
176 DESCRIPTION="Lightweight and cross-platform clipboard history applet"
177 HOMEPAGE="https://github.com/pvanek/qlipper"
178
179 diff --git a/x11-misc/qps/qps-1.10.20.ebuild b/x11-misc/qps/qps-1.10.20.ebuild
180 index 707dc0fadb3..b585aaca7eb 100644
181 --- a/x11-misc/qps/qps-1.10.20.ebuild
182 +++ b/x11-misc/qps/qps-1.10.20.ebuild
183 @@ -3,7 +3,7 @@
184
185 EAPI=7
186
187 -inherit cmake-utils xdg-utils
188 +inherit cmake xdg-utils
189
190 DESCRIPTION="Visual process manager - Qt version of ps/top"
191 HOMEPAGE="https://lxqt.org/"
192
193 diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
194 index 61cdeb65e86..5d0ee8acd42 100644
195 --- a/x11-misc/qtfm/qtfm-99999.ebuild
196 +++ b/x11-misc/qtfm/qtfm-99999.ebuild
197 @@ -2,7 +2,7 @@
198 # Distributed under the terms of the GNU General Public License v2
199
200 EAPI=7
201 -inherit git-r3 xdg-utils cmake-utils
202 +inherit git-r3 xdg-utils cmake
203
204 DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
205 HOMEPAGE="https://qtfm.eu/"
206 @@ -39,7 +39,7 @@ src_configure() {
207 -DENABLE_FFMPEG="$(usex ffmpeg)"
208 -DENABLE_MAGICK="$(usex imagemagick)"
209 )
210 - cmake-utils_src_configure
211 + cmake_src_configure
212 }
213
214 pkg_postinst() {
215
216 diff --git a/x11-misc/screengrab/screengrab-1.101.ebuild b/x11-misc/screengrab/screengrab-1.101.ebuild
217 index 250095281d0..a8de9640bb1 100644
218 --- a/x11-misc/screengrab/screengrab-1.101.ebuild
219 +++ b/x11-misc/screengrab/screengrab-1.101.ebuild
220 @@ -3,7 +3,7 @@
221
222 EAPI=7
223
224 -inherit cmake-utils xdg-utils
225 +inherit cmake xdg-utils
226
227 DESCRIPTION="Qt application for getting screenshots"
228 HOMEPAGE="https://lxqt.org/"
229
230 diff --git a/x11-terms/qterminal/qterminal-0.14.1.ebuild b/x11-terms/qterminal/qterminal-0.14.1.ebuild
231 index 528f35e53d0..aef92c45a4a 100644
232 --- a/x11-terms/qterminal/qterminal-0.14.1.ebuild
233 +++ b/x11-terms/qterminal/qterminal-0.14.1.ebuild
234 @@ -3,7 +3,7 @@
235
236 EAPI=7
237
238 -inherit cmake-utils xdg-utils
239 +inherit cmake xdg-utils
240
241 DESCRIPTION="Qt-based multitab terminal emulator"
242 HOMEPAGE="https://lxqt.org/"
243
244 diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild
245 index f7797f36015..d95e1018d60 100644
246 --- a/x11-terms/qterminal/qterminal-9999.ebuild
247 +++ b/x11-terms/qterminal/qterminal-9999.ebuild
248 @@ -3,7 +3,7 @@
249
250 EAPI=7
251
252 -inherit cmake-utils xdg-utils
253 +inherit cmake xdg-utils
254
255 DESCRIPTION="Qt-based multitab terminal emulator"
256 HOMEPAGE="https://lxqt.org/"