Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevplatform/files/, dev-util/kdevelop-python/, dev-util/kdevplatform/, ...
Date: Sun, 01 Jan 2017 10:01:16
Message-Id: 1483238425.e5f5fffd1b5afc5b7a04c9555a95c03f48d98958.asturm@gentoo
1 commit: e5f5fffd1b5afc5b7a04c9555a95c03f48d98958
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 1 02:35:26 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 1 02:40:25 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e5f5fffd
7
8 dev-util: Drop kdevelop 5.0 stable branch
9
10 Package-Manager: portage-2.3.0
11
12 dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild | 39 --------
13 dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild | 43 --------
14 .../kdevelop-python-5.0.9999.ebuild | 51 ----------
15 dev-util/kdevelop/kdevelop-5.0.9999.ebuild | 94 ------------------
16 .../files/kdevplatform-5.0.1-unused-deps.patch | 24 -----
17 dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild | 109 ---------------------
18 6 files changed, 360 deletions(-)
19
20 diff --git a/dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild b/dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild
21 deleted file mode 100644
22 index b775048..0000000
23 --- a/dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild
24 +++ /dev/null
25 @@ -1,39 +0,0 @@
26 -# Copyright 1999-2017 Gentoo Foundation
27 -# Distributed under the terms of the GNU General Public License v2
28 -# $Id$
29 -
30 -EAPI=6
31 -
32 -EGIT_BRANCH="5.0"
33 -KDEBASE="kdevelop"
34 -KMNAME="kdev-css"
35 -inherit kde5
36 -
37 -DESCRIPTION="CSS Language Support plugin for KDevelop"
38 -LICENSE="GPL-2"
39 -KEYWORDS=""
40 -IUSE=""
41 -
42 -COMMON_DEPEND="
43 - $(add_frameworks_dep kcmutils)
44 - $(add_frameworks_dep kconfig)
45 - $(add_frameworks_dep kconfigwidgets)
46 - $(add_frameworks_dep kcoreaddons)
47 - $(add_frameworks_dep kdelibs4support)
48 - $(add_frameworks_dep ki18n)
49 - $(add_frameworks_dep kio)
50 - $(add_frameworks_dep ktexteditor)
51 - $(add_frameworks_dep kxmlgui)
52 - $(add_frameworks_dep threadweaver)
53 - $(add_qt_dep qtgui)
54 - $(add_qt_dep qtwebkit)
55 - $(add_qt_dep qtwidgets)
56 - dev-util/kdevelop-pg-qt:5
57 - dev-util/kdevplatform:5
58 -"
59 -DEPEND="${COMMON_DEPEND}
60 - sys-devel/flex
61 -"
62 -RDEPEND="${COMMON_DEPEND}
63 - dev-util/kdevelop:5
64 -"
65
66 diff --git a/dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild
67 deleted file mode 100644
68 index 01eca58..0000000
69 --- a/dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild
70 +++ /dev/null
71 @@ -1,43 +0,0 @@
72 -# Copyright 1999-2017 Gentoo Foundation
73 -# Distributed under the terms of the GNU General Public License v2
74 -# $Id$
75 -
76 -EAPI=6
77 -
78 -EGIT_BRANCH="5.0"
79 -KDEBASE="kdevelop"
80 -KDE_DOC_DIR="docs"
81 -KDE_HANDBOOK="forceoptional"
82 -KDE_TEST="forceoptional-recursive"
83 -KMNAME="kdev-php"
84 -VIRTUALX_REQUIRED="test"
85 -inherit kde5
86 -
87 -DESCRIPTION="PHP plugin for KDevelop"
88 -LICENSE="GPL-2 LGPL-2"
89 -IUSE=""
90 -[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
91 -
92 -DEPEND="
93 - $(add_frameworks_dep karchive)
94 - $(add_frameworks_dep kcmutils)
95 - $(add_frameworks_dep kconfig)
96 - $(add_frameworks_dep kconfigwidgets)
97 - $(add_frameworks_dep kcoreaddons)
98 - $(add_frameworks_dep ki18n)
99 - $(add_frameworks_dep kio)
100 - $(add_frameworks_dep kitemmodels)
101 - $(add_frameworks_dep ktexteditor)
102 - $(add_frameworks_dep kwidgetsaddons)
103 - $(add_frameworks_dep kxmlgui)
104 - $(add_frameworks_dep threadweaver)
105 - $(add_qt_dep qtgui)
106 - $(add_qt_dep qtwebkit)
107 - $(add_qt_dep qtwidgets)
108 - dev-util/kdevelop-pg-qt:5
109 - >=dev-util/kdevplatform-${PV}:${SLOT}
110 -"
111 -RDEPEND="${DEPEND}
112 - !dev-util/kdevelop-php-docs
113 - dev-util/kdevelop:5
114 -"
115
116 diff --git a/dev-util/kdevelop-python/kdevelop-python-5.0.9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.0.9999.ebuild
117 deleted file mode 100644
118 index 1444e75..0000000
119 --- a/dev-util/kdevelop-python/kdevelop-python-5.0.9999.ebuild
120 +++ /dev/null
121 @@ -1,51 +0,0 @@
122 -# Copyright 1999-2017 Gentoo Foundation
123 -# Distributed under the terms of the GNU General Public License v2
124 -# $Id$
125 -
126 -EAPI=6
127 -
128 -EGIT_BRANCH="5.0"
129 -KDEBASE="kdevelop"
130 -KMNAME="kdev-python"
131 -PYTHON_COMPAT=( python3_5 )
132 -inherit kde5 python-single-r1
133 -
134 -DESCRIPTION="Python plugin for KDevelop"
135 -IUSE=""
136 -[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
137 -
138 -DEPEND="${PYTHON_DEPS}
139 - $(add_frameworks_dep kcompletion)
140 - $(add_frameworks_dep kconfig)
141 - $(add_frameworks_dep kcoreaddons)
142 - $(add_frameworks_dep ki18n)
143 - $(add_frameworks_dep kio)
144 - $(add_frameworks_dep kitemmodels)
145 - $(add_frameworks_dep knewstuff)
146 - $(add_frameworks_dep kparts)
147 - $(add_frameworks_dep ktexteditor)
148 - $(add_frameworks_dep kwidgetsaddons)
149 - $(add_frameworks_dep kxmlgui)
150 - $(add_frameworks_dep threadweaver)
151 - $(add_qt_dep qtgui)
152 - $(add_qt_dep qtwidgets)
153 - dev-util/kdevplatform:5
154 -"
155 -RDEPEND="${DEPEND}
156 - dev-util/kdevelop:5
157 -"
158 -
159 -RESTRICT+=" test"
160 -
161 -pkg_setup() {
162 - python-single-r1_pkg_setup
163 - kde5_pkg_setup
164 -}
165 -
166 -src_compile() {
167 - pushd "${WORKDIR}"/${P}_build > /dev/null || die
168 - emake parser
169 - popd > /dev/null || die
170 -
171 - kde5_src_compile
172 -}
173
174 diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
175 deleted file mode 100644
176 index d2eeed6..0000000
177 --- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
178 +++ /dev/null
179 @@ -1,94 +0,0 @@
180 -# Copyright 1999-2017 Gentoo Foundation
181 -# Distributed under the terms of the GNU General Public License v2
182 -# $Id$
183 -
184 -EAPI=6
185 -
186 -EGIT_BRANCH="5.0"
187 -KDE_HANDBOOK="forceoptional"
188 -KDE_TEST="forceoptional-recursive"
189 -VIRTUALX_REQUIRED="test"
190 -inherit kde5
191 -
192 -DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
193 -LICENSE="GPL-2 LGPL-2"
194 -IUSE="+cxx +gdbui +ninja okteta +plasma +qmake qthelp"
195 -[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
196 -
197 -COMMON_DEPEND="
198 - $(add_frameworks_dep kcmutils)
199 - $(add_frameworks_dep kcompletion)
200 - $(add_frameworks_dep kconfig)
201 - $(add_frameworks_dep kconfigwidgets)
202 - $(add_frameworks_dep kcoreaddons)
203 - $(add_frameworks_dep kcrash)
204 - $(add_frameworks_dep kdeclarative)
205 - $(add_frameworks_dep ki18n)
206 - $(add_frameworks_dep kiconthemes)
207 - $(add_frameworks_dep kio)
208 - $(add_frameworks_dep kitemmodels)
209 - $(add_frameworks_dep kitemviews)
210 - $(add_frameworks_dep kjobwidgets)
211 - $(add_frameworks_dep knewstuff)
212 - $(add_frameworks_dep knotifyconfig)
213 - $(add_frameworks_dep kparts)
214 - $(add_frameworks_dep kservice)
215 - $(add_frameworks_dep ktexteditor)
216 - $(add_frameworks_dep kwidgetsaddons)
217 - $(add_frameworks_dep kwindowsystem)
218 - $(add_frameworks_dep kxmlgui)
219 - $(add_frameworks_dep threadweaver)
220 - $(add_qt_dep qtdbus)
221 - $(add_qt_dep qtdeclarative)
222 - $(add_qt_dep qtgui)
223 - $(add_qt_dep qtnetwork)
224 - $(add_qt_dep qtwebkit)
225 - $(add_qt_dep qtwidgets)
226 - $(add_qt_dep qtxml)
227 - >=dev-util/kdevplatform-${PV}:5
228 - x11-misc/shared-mime-info
229 - cxx? ( >=sys-devel/clang-3.5.0 )
230 - gdbui? ( $(add_plasma_dep libksysguard) )
231 - okteta? ( $(add_kdeapps_dep okteta) )
232 - plasma? (
233 - $(add_frameworks_dep krunner)
234 - $(add_frameworks_dep plasma)
235 - )
236 - qmake? ( dev-util/kdevelop-pg-qt:5 )
237 - qthelp? ( $(add_qt_dep qthelp) )
238 -"
239 -DEPEND="${COMMON_DEPEND}
240 - $(add_qt_dep qtconcurrent)
241 -"
242 -RDEPEND="${COMMON_DEPEND}
243 - $(add_kdeapps_dep kapptemplate)
244 - $(add_kdeapps_dep kio-extras)
245 - >=sys-devel/gdb-7.0[python]
246 - ninja? ( dev-util/ninja )
247 - !dev-util/kdevelop:4
248 - !dev-util/kdevelop-clang
249 - !dev-util/kdevelop-qmake
250 - !dev-util/kdevelop-qmljs
251 - !<kde-apps/kapptemplate-16.04.0
252 -"
253 -
254 -RESTRICT+=" test"
255 -# see bug 366471
256 -
257 -PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" )
258 -
259 -src_configure() {
260 - local mycmakeargs=(
261 - -DLEGACY_CPP_SUPPORT=$(usex !cxx)
262 - -DBUILD_cpp=OFF
263 - $(cmake-utils_use_find_package gdbui KF5SysGuard)
264 - -DBUILD_executeplasmoid=$(usex plasma)
265 - $(cmake-utils_use_find_package plasma KF5Plasma)
266 - -DBUILD_ninjabuilder=$(usex ninja)
267 - $(cmake-utils_use_find_package okteta OktetaKastenControllers)
268 - $(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
269 - -DBUILD_qthelp=$(usex qthelp)
270 - )
271 -
272 - kde5_src_configure
273 -}
274
275 diff --git a/dev-util/kdevplatform/files/kdevplatform-5.0.1-unused-deps.patch b/dev-util/kdevplatform/files/kdevplatform-5.0.1-unused-deps.patch
276 deleted file mode 100644
277 index 0a0d0f7..0000000
278 --- a/dev-util/kdevplatform/files/kdevplatform-5.0.1-unused-deps.patch
279 +++ /dev/null
280 @@ -1,24 +0,0 @@
281 -commit 9d2423f20458d735454b9917b4b0f5e39a7929f5
282 -Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
283 -Date: Sun Oct 16 09:36:03 2016 +0200
284 -
285 - Remove unused dependencies
286 -
287 - Qt5Quick, Qt5QuickWidgets only used in welcomepage
288 -
289 - REVIEW: 129196
290 -
291 -diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
292 -index 97666f3..118acf1 100644
293 ---- a/shell/CMakeLists.txt
294 -+++ b/shell/CMakeLists.txt
295 -@@ -121,9 +121,6 @@ LINK_PUBLIC
296 - KDev::OutputView
297 - KDev::Interfaces
298 - LINK_PRIVATE
299 -- Qt5::Quick
300 -- Qt5::QuickWidgets
301 --
302 - KF5::GuiAddons
303 - KF5::ConfigWidgets
304 - KF5::IconThemes
305
306 diff --git a/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild b/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild
307 deleted file mode 100644
308 index d7e0bc5..0000000
309 --- a/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild
310 +++ /dev/null
311 @@ -1,109 +0,0 @@
312 -# Copyright 1999-2017 Gentoo Foundation
313 -# Distributed under the terms of the GNU General Public License v2
314 -# $Id$
315 -
316 -EAPI=6
317 -
318 -EGIT_BRANCH="5.0"
319 -KDEBASE="kdevelop"
320 -KDE_TEST="forceoptional-recursive"
321 -VIRTUALDBUS_TEST="true"
322 -VIRTUALX_REQUIRED="test"
323 -inherit kde5
324 -
325 -DESCRIPTION="KDE development support libraries and apps"
326 -IUSE="cvs reviewboard subversion +welcomepage"
327 -[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
328 -
329 -COMMON_DEPEND="
330 - $(add_frameworks_dep karchive)
331 - $(add_frameworks_dep kbookmarks)
332 - $(add_frameworks_dep kcmutils)
333 - $(add_frameworks_dep kcodecs)
334 - $(add_frameworks_dep kcompletion)
335 - $(add_frameworks_dep kconfig)
336 - $(add_frameworks_dep kconfigwidgets)
337 - $(add_frameworks_dep kcoreaddons)
338 - $(add_frameworks_dep kdeclarative)
339 - $(add_frameworks_dep kguiaddons)
340 - $(add_frameworks_dep ki18n)
341 - $(add_frameworks_dep kiconthemes)
342 - $(add_frameworks_dep kio)
343 - $(add_frameworks_dep kitemmodels)
344 - $(add_frameworks_dep kitemviews)
345 - $(add_frameworks_dep kjobwidgets)
346 - $(add_frameworks_dep knewstuff)
347 - $(add_frameworks_dep knotifications)
348 - $(add_frameworks_dep knotifyconfig)
349 - $(add_frameworks_dep kparts)
350 - $(add_frameworks_dep kservice)
351 - $(add_frameworks_dep ktexteditor)
352 - $(add_frameworks_dep ktextwidgets)
353 - $(add_frameworks_dep kwidgetsaddons)
354 - $(add_frameworks_dep kwindowsystem)
355 - $(add_frameworks_dep kxmlgui)
356 - $(add_frameworks_dep sonnet)
357 - $(add_frameworks_dep threadweaver)
358 - $(add_kdeapps_dep libkomparediff2)
359 - $(add_qt_dep qtdbus)
360 - $(add_qt_dep qtgui)
361 - $(add_qt_dep qttest)
362 - $(add_qt_dep qtwebkit)
363 - $(add_qt_dep qtwidgets)
364 - $(add_qt_dep qtxml)
365 - dev-libs/grantlee:5
366 - reviewboard? ( dev-libs/purpose )
367 - subversion? (
368 - dev-libs/apr:1
369 - dev-libs/apr-util:1
370 - dev-vcs/subversion
371 - )
372 - welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
373 -"
374 -DEPEND="${COMMON_DEPEND}
375 - dev-libs/boost
376 - $(add_qt_dep qtconcurrent)
377 -"
378 -RDEPEND="${COMMON_DEPEND}
379 - cvs? ( dev-vcs/cvs )
380 - !dev-util/kdevelop:4
381 - !dev-util/kdevplatform:4
382 -"
383 -
384 -REQUIRED_USE="test? ( welcomepage )"
385 -
386 -RESTRICT+=" test"
387 -
388 -PATCHES=( "${FILESDIR}/${PN}-5.0.1-unused-deps.patch" )
389 -
390 -src_prepare() {
391 - kde5_src_prepare
392 - # root tests subdirectory actually does not contain tests, installs stuff
393 - if ! use test; then
394 - sed -i -e "/add_subdirectory(tests)/ s/#DONOTCOMPILE //" \
395 - CMakeLists.txt || die "Failed to fix CMakeLists.txt"
396 - sed -i -e '1s/^/find_package(Qt5Test \$\{QT_MIN_VERSION\})\n/' \
397 - tests/CMakeLists.txt || die "Failed to fix tests/CMakeLists.txt"
398 - fi
399 -}
400 -
401 -src_configure() {
402 - local mycmakeargs=(
403 - -DBUILD_cvs=$(usex cvs)
404 - $(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
405 - $(cmake-utils_use_find_package subversion SubversionLibrary)
406 - $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
407 - )
408 -
409 - kde5_src_configure
410 -}
411 -
412 -pkg_postinst() {
413 - kde5_pkg_postinst
414 -
415 - if ! has_version "kde-apps/konsole" ; then
416 - echo
417 - elog "For konsole view, please install kde-apps/konsole"
418 - echo
419 - fi
420 -}