Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/
Date: Mon, 09 Jul 2018 16:42:59
Message-Id: 1531154553.fbf77a3bbbf8137cf64f2fca4f4488f939db6f09.johu@gentoo
1 commit: fbf77a3bbbf8137cf64f2fca4f4488f939db6f09
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 9 16:41:13 2018 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 9 16:42:33 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf77a3b
7
8 dev-util/kdevelop: Remove 5.2.1
9
10 Superseded by 5.2.3.
11
12 Package-Manager: Portage-2.3.41, Repoman-2.3.9
13
14 dev-util/kdevelop/Manifest | 1 -
15 .../kdevelop/files/kdevelop-5.2.1-qt-5.11.patch | 52 --------
16 dev-util/kdevelop/kdevelop-5.2.1.ebuild | 135 ---------------------
17 3 files changed, 188 deletions(-)
18
19 diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
20 index 96c2e88ae23..e74e0c9097d 100644
21 --- a/dev-util/kdevelop/Manifest
22 +++ b/dev-util/kdevelop/Manifest
23 @@ -1,2 +1 @@
24 -DIST kdevelop-5.2.1.tar.xz 6653576 BLAKE2B 800ab50b62ca70e54d66bc7956b257e6d14f5a2c2fda7c7720aa0ddf1dad1dd2d7f993103c7f4caed0fc78734643a89f2710cb598319695d9ea6d79f62fd6305 SHA512 ee4a7f93c4f5168e6c63ca415a1f757cb7d2615370201700db16abdf1799e5c12421e382f5937be4a65af026a00df679b745fc4dab4d73974275d95d53173cd0
25 DIST kdevelop-5.2.3.tar.xz 6643364 BLAKE2B a08d5cc786a603b3e23d1d9bf9d362a35f2280436072df239ff6becbd9f0ecc370b35a8e95d3443475218eb5a27e044d76f3d34cd41f082fc65650ce05c499f7 SHA512 5a7f514f24725ab1dbb33d63fd365159c3a8831c400aeef4f1e463acc60d81e9db1a23d320b5be215597884fbf0cc6ec8aed4f69e1fd60f68328b5a052b39c3d
26
27 diff --git a/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch b/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch
28 deleted file mode 100644
29 index 72b0f8b035c..00000000000
30 --- a/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch
31 +++ /dev/null
32 @@ -1,52 +0,0 @@
33 -From a5ec6847bad98d1fc45f5b8c1cc289f3fcc84b72 Mon Sep 17 00:00:00 2001
34 -From: Andras Mantia <andras@××××.com>
35 -Date: Mon, 12 Feb 2018 17:52:15 +0200
36 -Subject: Add includes to build with Qt 5.11
37 -
38 -(cherry picked from commit 0e361a5184bda61796162830ecff88b41c1b305b)
39 ----
40 - plugins/debuggercommon/widgets/disassemblewidget.h | 1 +
41 - plugins/externalscript/editexternalscript.cpp | 1 +
42 - plugins/git/gitnameemaildialog.cpp | 2 ++
43 - 3 files changed, 4 insertions(+)
44 -
45 -diff --git a/plugins/debuggercommon/widgets/disassemblewidget.h b/plugins/debuggercommon/widgets/disassemblewidget.h
46 -index e8d32ef..543b69f 100644
47 ---- a/plugins/debuggercommon/widgets/disassemblewidget.h
48 -+++ b/plugins/debuggercommon/widgets/disassemblewidget.h
49 -@@ -26,6 +26,7 @@
50 -
51 - #include "mi/mi.h"
52 -
53 -+#include <QActionGroup>
54 - #include <QTreeWidget>
55 - #include <QUrl>
56 -
57 -diff --git a/plugins/externalscript/editexternalscript.cpp b/plugins/externalscript/editexternalscript.cpp
58 -index 5ec756b..2c0de28 100644
59 ---- a/plugins/externalscript/editexternalscript.cpp
60 -+++ b/plugins/externalscript/editexternalscript.cpp
61 -@@ -23,6 +23,7 @@
62 -
63 - #include "externalscriptitem.h"
64 -
65 -+#include <QAction>
66 - #include <QDialogButtonBox>
67 - #include <QPushButton>
68 -
69 -diff --git a/plugins/git/gitnameemaildialog.cpp b/plugins/git/gitnameemaildialog.cpp
70 -index ba24a70..ddba09c 100644
71 ---- a/plugins/git/gitnameemaildialog.cpp
72 -+++ b/plugins/git/gitnameemaildialog.cpp
73 -@@ -27,6 +27,8 @@
74 -
75 - #include <QDialog>
76 - #include <QPushButton>
77 -+#include <QRegularExpression>
78 -+#include <QValidator>
79 -
80 - using namespace KDevelop;
81 -
82 ---
83 -cgit v0.11.2
84 -
85
86 diff --git a/dev-util/kdevelop/kdevelop-5.2.1.ebuild b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
87 deleted file mode 100644
88 index 93a5bc5f7b9..00000000000
89 --- a/dev-util/kdevelop/kdevelop-5.2.1.ebuild
90 +++ /dev/null
91 @@ -1,135 +0,0 @@
92 -# Copyright 1999-2018 Gentoo Foundation
93 -# Distributed under the terms of the GNU General Public License v2
94 -
95 -EAPI=6
96 -
97 -EGIT_BRANCH="5.2"
98 -KDE_HANDBOOK="forceoptional"
99 -KDE_TEST="true"
100 -VIRTUALDBUS_TEST="true"
101 -VIRTUALX_REQUIRED="test"
102 -inherit kde5
103 -
104 -DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
105 -LICENSE="GPL-2 LGPL-2"
106 -IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
107 -[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
108 -
109 -REQUIRED_USE="test? ( welcomepage )"
110 -
111 -COMMON_DEPEND="
112 - $(add_frameworks_dep karchive)
113 - $(add_frameworks_dep kbookmarks)
114 - $(add_frameworks_dep kcmutils)
115 - $(add_frameworks_dep kcodecs)
116 - $(add_frameworks_dep kcompletion)
117 - $(add_frameworks_dep kconfig)
118 - $(add_frameworks_dep kconfigwidgets)
119 - $(add_frameworks_dep kcoreaddons)
120 - $(add_frameworks_dep kcrash)
121 - $(add_frameworks_dep kdeclarative)
122 - $(add_frameworks_dep kguiaddons)
123 - $(add_frameworks_dep ki18n)
124 - $(add_frameworks_dep kiconthemes)
125 - $(add_frameworks_dep kio)
126 - $(add_frameworks_dep kitemmodels)
127 - $(add_frameworks_dep kitemviews)
128 - $(add_frameworks_dep kjobwidgets)
129 - $(add_frameworks_dep knewstuff)
130 - $(add_frameworks_dep knotifications)
131 - $(add_frameworks_dep knotifyconfig)
132 - $(add_frameworks_dep kparts)
133 - $(add_frameworks_dep kservice)
134 - $(add_frameworks_dep ktexteditor)
135 - $(add_frameworks_dep ktextwidgets)
136 - $(add_frameworks_dep kwidgetsaddons)
137 - $(add_frameworks_dep kwindowsystem)
138 - $(add_frameworks_dep kxmlgui)
139 - $(add_frameworks_dep sonnet)
140 - $(add_frameworks_dep threadweaver)
141 - $(add_kdeapps_dep libkomparediff2)
142 - $(add_qt_dep qtdbus)
143 - $(add_qt_dep qtdeclarative)
144 - $(add_qt_dep qtgui)
145 - $(add_qt_dep qthelp)
146 - $(add_qt_dep qtnetwork)
147 - $(add_qt_dep qttest)
148 - $(add_qt_dep qtwidgets)
149 - $(add_qt_dep qtxml)
150 - dev-libs/grantlee:5
151 - >=sys-devel/clang-3.8.0:=
152 - x11-misc/shared-mime-info
153 - gdbui? ( $(add_plasma_dep libksysguard) )
154 - hex? ( app-editors/okteta:5 )
155 - plasma? (
156 - $(add_frameworks_dep krunner)
157 - $(add_frameworks_dep plasma)
158 - )
159 - qmake? ( dev-util/kdevelop-pg-qt:5 )
160 - reviewboard? ( kde-frameworks/purpose )
161 - subversion? (
162 - dev-libs/apr:1
163 - dev-libs/apr-util:1
164 - dev-vcs/subversion
165 - )
166 - webkit? ( $(add_qt_dep qtwebkit) )
167 - !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
168 - welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
169 -"
170 -DEPEND="${COMMON_DEPEND}
171 - dev-libs/boost
172 - $(add_qt_dep qtconcurrent)
173 -"
174 -RDEPEND="${COMMON_DEPEND}
175 - $(add_kdeapps_dep kapptemplate)
176 - $(add_kdeapps_dep kio-extras)
177 - dev-util/ninja
178 - >=sys-devel/gdb-7.0[python]
179 - cvs? ( dev-vcs/cvs )
180 - reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
181 - !dev-util/kdevelop:4
182 - !dev-util/kdevelop-clang
183 - !dev-util/kdevelop-cppcheck
184 - !dev-util/kdevelop-qmake
185 - !dev-util/kdevelop-qmljs
186 - !dev-util/kdevplatform
187 - !<kde-apps/kapptemplate-16.04.0
188 -"
189 -
190 -PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
191 -
192 -RESTRICT+=" test"
193 -# see bug 366471
194 -
195 -src_configure() {
196 - local mycmakeargs=(
197 - -DBUILD_cvs=$(usex cvs)
198 - $(cmake-utils_use_find_package gdbui KF5SysGuard)
199 - -DBUILD_executeplasmoid=$(usex plasma)
200 - $(cmake-utils_use_find_package plasma KF5Plasma)
201 - $(cmake-utils_use_find_package hex OktetaKastenControllers)
202 - $(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
203 - $(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
204 - $(cmake-utils_use_find_package subversion SubversionLibrary)
205 - $(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
206 - $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
207 - )
208 -
209 - kde5_src_configure
210 -}
211 -
212 -pkg_postinst() {
213 - kde5_pkg_postinst
214 -
215 - if ! has_version "kde-apps/konsole" ; then
216 - elog "For konsole view, please install kde-apps/konsole"
217 - fi
218 -
219 - if ! has_version "dev-util/cppcheck" ; then
220 - elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
221 - fi
222 -
223 - if ! has_version "dev-util/heaptrack[qt5]" ; then
224 - elog "For heap memory profiling support, please install dev-util/heaptrack"
225 - fi
226 -}