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/files/, dev-util/kdevelop/
Date: Thu, 01 Dec 2016 18:26:53
Message-Id: 1480616800.ae1e1766d93b19965aa432133304d02bd006392d.johu@gentoo
1 commit: ae1e1766d93b19965aa432133304d02bd006392d
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 1 18:25:21 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 1 18:26:40 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae1e1766
7
8 dev-util/kdevelop: Remove 5.0.2
9
10 Package-Manager: portage-2.3.2
11
12 dev-util/kdevelop/Manifest | 1 -
13 .../files/kdevelop-5.0.2-github-crash.patch | 39 ---------
14 dev-util/kdevelop/kdevelop-5.0.2.ebuild | 97 ----------------------
15 3 files changed, 137 deletions(-)
16
17 diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
18 index 2684623..130783f 100644
19 --- a/dev-util/kdevelop/Manifest
20 +++ b/dev-util/kdevelop/Manifest
21 @@ -1,4 +1,3 @@
22 DIST kdevelop-4.7.2.tar.xz 4441896 SHA256 5801a38a9abfebead18b74c0a0f5a6d68118b297c96ef1e2f75c8bfae3463b19 SHA512 f05643f185a02ce9f07b5e48b0cf61de5e0e2ed892b4fbe4edf749319c37466a2e904c7b64604cdff3b1c5c20e384ea23e7fdd1e30ed15642fd70f5e172e570a WHIRLPOOL 2caf928f84e22aacfa2691fc7a2752f84a38cdfccc4b3c176c04c0f81445a25548f7723ee57da293a921f7934789386bce7e4c50751cd4d61da2d15c39490695
23 DIST kdevelop-4.7.3.tar.bz2 4826588 SHA256 9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35 SHA512 e6d410bda001cfaed7c15383497992d6aad0a878c4c6f786c154dc9de581139baf05e592a8355481dd25c7f8d3b52b3a9516187e1e85c1f229ba32bc7cc57636 WHIRLPOOL 521b58b688344884ed178b9f7eaa87f11c0eb7e631a83c33ba4b6b23ae49ca866da667e2e2d726ad17ea3bf311b66a2f2695627d50c4dbbed8074bb338270790
24 -DIST kdevelop-5.0.2.tar.xz 4994268 SHA256 9b017901167723230dee8b565cdc7b0e61762415ffcc0a32708f04f7ab668666 SHA512 a92d0c795442642f2bd7db9e37c3f13d67b19e9bb3d5e076ba409ae271062d3e022e284b5a2ce6be0b01d753c5ff4a3522a8149ab6f5f007bc6f24e7bd68e6db WHIRLPOOL 26152f4f78421e45d5ac6a5c8058a155cb5da38c8b348afeceb8868fe11d984d020f2e8b993f617209a118fc959684890bb78b5f0173f14e0d085d3975c319ca
25 DIST kdevelop-5.0.3.tar.xz 5004500 SHA256 17a58dfc38b853c6c5987084e8973b4f7f5015a6c2c20f94c2a9f96b0c13f601 SHA512 5fa799412c5a847bdefeca3f339c3b17b7693761209f646b6aee35734abded234d871ec9763079db7a4236047d68b3ab9a89ac22a0abb8b7a23d4c67cf749444 WHIRLPOOL fa1688d2dfd5d94cf71ae397c9b6c96f0e8c0999c714a41932e9aecd9bea40159f9e39d183cac23a509f63666445b026e05905ddfc176e1e7673f78c9651438a
26
27 diff --git a/dev-util/kdevelop/files/kdevelop-5.0.2-github-crash.patch b/dev-util/kdevelop/files/kdevelop-5.0.2-github-crash.patch
28 deleted file mode 100644
29 index 09cb944..00000000
30 --- a/dev-util/kdevelop/files/kdevelop-5.0.2-github-crash.patch
31 +++ /dev/null
32 @@ -1,39 +0,0 @@
33 -From: Kevin Funk <kfunk@×××.org>
34 -Date: Tue, 18 Oct 2016 07:47:28 +0000
35 -Subject: GitHub: Don't crash when Git plugin not loaded
36 -X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&a=commitdiff&h=3afcc322a94878c8f5f662c1c5795b75a3bf62a5
37 ----
38 -GitHub: Don't crash when Git plugin not loaded
39 -
40 -BUG: 331883
41 -FIXED-IN: 5.0.3
42 ----
43 -
44 -
45 ---- a/providers/ghprovider/ghproviderwidget.cpp
46 -+++ b/providers/ghprovider/ghproviderwidget.cpp
47 -@@ -91,17 +91,20 @@
48 - if (!pos.isValid())
49 - return nullptr;
50 -
51 -+ auto plugin = ICore::self()->pluginController()->pluginForExtension("org.kdevelop.IBasicVersionControl", "kdevgit");
52 -+ if (!plugin) {
53 -+ KMessageBox::error(0, i18n("The Git plugin could not be loaded which is required to import a Github project."), i18n("Github Provider Error"));
54 -+ return nullptr;
55 -+ }
56 -+
57 - QString url = pos.data(ProviderModel::VcsLocationRole).toString();
58 - if (m_account->validAccount())
59 - url = "https://" + m_account->token() + "@" + url.mid(8);
60 - QUrl real = QUrl(url);
61 - VcsLocation loc(real);
62 -
63 -- auto plugin = ICore::self()->pluginController()->pluginForExtension("org.kdevelop.IBasicVersionControl", "kdevgit");
64 -- Q_ASSERT(plugin);
65 - auto vc = plugin->extension<IBasicVersionControl>();
66 - Q_ASSERT(vc);
67 --
68 - return vc->createWorkingCopy(loc, dest);
69 - }
70 -
71 -
72
73 diff --git a/dev-util/kdevelop/kdevelop-5.0.2.ebuild b/dev-util/kdevelop/kdevelop-5.0.2.ebuild
74 deleted file mode 100644
75 index 783a48f..00000000
76 --- a/dev-util/kdevelop/kdevelop-5.0.2.ebuild
77 +++ /dev/null
78 @@ -1,97 +0,0 @@
79 -# Copyright 1999-2016 Gentoo Foundation
80 -# Distributed under the terms of the GNU General Public License v2
81 -# $Id$
82 -
83 -EAPI=6
84 -
85 -EGIT_BRANCH="5.0"
86 -KDE_HANDBOOK="forceoptional"
87 -KDE_TEST="forceoptional-recursive"
88 -VIRTUALX_REQUIRED="test"
89 -inherit kde5
90 -
91 -DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
92 -LICENSE="GPL-2 LGPL-2"
93 -IUSE="+cxx +gdbui +ninja okteta +plasma +qmake qthelp"
94 -[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
95 -
96 -COMMON_DEPEND="
97 - $(add_frameworks_dep kcmutils)
98 - $(add_frameworks_dep kcompletion)
99 - $(add_frameworks_dep kconfig)
100 - $(add_frameworks_dep kconfigwidgets)
101 - $(add_frameworks_dep kcoreaddons)
102 - $(add_frameworks_dep kcrash)
103 - $(add_frameworks_dep kdeclarative)
104 - $(add_frameworks_dep ki18n)
105 - $(add_frameworks_dep kiconthemes)
106 - $(add_frameworks_dep kio)
107 - $(add_frameworks_dep kitemmodels)
108 - $(add_frameworks_dep kitemviews)
109 - $(add_frameworks_dep kjobwidgets)
110 - $(add_frameworks_dep knewstuff)
111 - $(add_frameworks_dep knotifyconfig)
112 - $(add_frameworks_dep kparts)
113 - $(add_frameworks_dep kservice)
114 - $(add_frameworks_dep ktexteditor)
115 - $(add_frameworks_dep kwidgetsaddons)
116 - $(add_frameworks_dep kwindowsystem)
117 - $(add_frameworks_dep kxmlgui)
118 - $(add_frameworks_dep threadweaver)
119 - $(add_qt_dep qtdbus)
120 - $(add_qt_dep qtdeclarative)
121 - $(add_qt_dep qtgui)
122 - $(add_qt_dep qtnetwork)
123 - $(add_qt_dep qtwebkit)
124 - $(add_qt_dep qtwidgets)
125 - $(add_qt_dep qtxml)
126 - >=dev-util/kdevplatform-${PV}:5
127 - x11-misc/shared-mime-info
128 - cxx? ( >=sys-devel/clang-3.5.0 )
129 - gdbui? ( $(add_plasma_dep libksysguard) )
130 - okteta? ( $(add_kdeapps_dep okteta) )
131 - plasma? (
132 - $(add_frameworks_dep krunner)
133 - $(add_frameworks_dep plasma)
134 - )
135 - qmake? ( dev-util/kdevelop-pg-qt:5 )
136 - qthelp? ( $(add_qt_dep qthelp) )
137 -"
138 -DEPEND="${COMMON_DEPEND}
139 - $(add_qt_dep qtconcurrent)
140 -"
141 -RDEPEND="${COMMON_DEPEND}
142 - $(add_kdeapps_dep kapptemplate)
143 - $(add_kdeapps_dep kio-extras)
144 - >=sys-devel/gdb-7.0[python]
145 - ninja? ( dev-util/ninja )
146 - !dev-util/kdevelop:4
147 - !dev-util/kdevelop-clang
148 - !dev-util/kdevelop-qmake
149 - !dev-util/kdevelop-qmljs
150 - !<kde-apps/kapptemplate-16.04.0
151 -"
152 -
153 -RESTRICT+=" test"
154 -# see bug 366471
155 -
156 -PATCHES=(
157 - "${FILESDIR}/${P}-ninja-optional.patch"
158 - "${FILESDIR}/${P}-github-crash.patch"
159 -)
160 -
161 -src_configure() {
162 - local mycmakeargs=(
163 - -DLEGACY_CPP_SUPPORT=$(usex !cxx)
164 - -DBUILD_cpp=OFF
165 - $(cmake-utils_use_find_package gdbui KF5SysGuard)
166 - -DBUILD_executeplasmoid=$(usex plasma)
167 - $(cmake-utils_use_find_package plasma KF5Plasma)
168 - -DBUILD_ninjabuilder=$(usex ninja)
169 - $(cmake-utils_use_find_package okteta OktetaKastenControllers)
170 - $(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
171 - -DBUILD_qthelp=$(usex qthelp)
172 - )
173 -
174 - kde5_src_configure
175 -}