gentoo resync : 14.07.2018

4 files changed, 2 insertions, 192 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 8751bd05ec3b..18dceb8d93b8 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,6 +1,3 @@
-AUX kdevelop-5.2.1-qt-5.11.patch 1581 BLAKE2B 83ef207fb434b3faa7c73752e9b48d7d52182b7cb2bee0f7ad840a124066b72431cd4b69601ea866bb79de483cca2ddfa6fb4d6ad6bcba8cefa0d2833e5067bd SHA512 d4adbcb6c1a26e9198d7997b84ee059216094b1b8d518bb39d1ddafbd968de6f40123e4495b8f2b3a649524247796fcd026545b09b62e9d544e0fd6b1ec74a69
-DIST kdevelop-5.2.1.tar.xz 6653576 BLAKE2B 800ab50b62ca70e54d66bc7956b257e6d14f5a2c2fda7c7720aa0ddf1dad1dd2d7f993103c7f4caed0fc78734643a89f2710cb598319695d9ea6d79f62fd6305 SHA512 ee4a7f93c4f5168e6c63ca415a1f757cb7d2615370201700db16abdf1799e5c12421e382f5937be4a65af026a00df679b745fc4dab4d73974275d95d53173cd0
 DIST kdevelop-5.2.3.tar.xz 6643364 BLAKE2B a08d5cc786a603b3e23d1d9bf9d362a35f2280436072df239ff6becbd9f0ecc370b35a8e95d3443475218eb5a27e044d76f3d34cd41f082fc65650ce05c499f7 SHA512 5a7f514f24725ab1dbb33d63fd365159c3a8831c400aeef4f1e463acc60d81e9db1a23d320b5be215597884fbf0cc6ec8aed4f69e1fd60f68328b5a052b39c3d
-EBUILD kdevelop-5.2.1.ebuild 3847 BLAKE2B 553c7a7917998ed08784af85ed78538c0877dbcd82a7bb95234832ec4ee59bdbd9d7db552e75efd6292a7085a6d8e926fec6c1f84271651f1f086438322c28e2 SHA512 49c93d602726a36669ffd79ab156928b2aeba15fe957545a8a9094e0bfa21e53ffc0791c90a548b5526e468aab369983441062965bd8818f2743140fd1a563fe
-EBUILD kdevelop-5.2.3.ebuild 3802 BLAKE2B 1d8b1f7476f8cbd5649e90701f93905bde687c67596bda25c71bbbd09931867743ee684a5fd4f2dbb8e563482657d5d232e396e181ec5b3e3e674bf1398cb47e SHA512 af39c59e2c0bddeddf511dbe7dec9ecc02ccd4b8a738e45908fd3bb3edf91632ad79aa48c2f655f8885f664ce0200f73eb8f9ce8778244415aaa2351a7b85388
+EBUILD kdevelop-5.2.3.ebuild 3801 BLAKE2B a7f01ea69e0652bd2f92819a829b29a20d29da1b9c43abee542a8550fc4aeb89245a7be9b7dc0cc42a26c0d899f8307ad796f955300b84488de6c9a2641efecf SHA512 e85d654094752e2b1fd9a348bf9374447681df93dee668464304b91cdc2aae962847535aa0138afe11b63ea8a5fdf3120213dd340b92e6e80845b6c1a0efd2a2
 MISC metadata.xml 794 BLAKE2B 5436f574309cfb4c014322f1d4c37edd68a6a7e77bfe5ea81e189f1440c4cced6310e01bc65923bb144d62d32349b2f862af18b307b621e347b3a076dc8a8862 SHA512 fdc3da939f866f065c7811ea70ac8a005a01455bd60db64f5f3107276de49d2d5e28c60650ad530636fb5e4a51a3acd69ef30ea5f1c895e9ddf410b5eb287f6a
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
deleted file mode 100644
index 72b0f8b035cf..000000000000
--- a/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From a5ec6847bad98d1fc45f5b8c1cc289f3fcc84b72 Mon Sep 17 00:00:00 2001
-From: Andras Mantia <andras@kdab.com>
-Date: Mon, 12 Feb 2018 17:52:15 +0200
-Subject: Add includes to build with Qt 5.11
-
-(cherry picked from commit 0e361a5184bda61796162830ecff88b41c1b305b)
----
- plugins/debuggercommon/widgets/disassemblewidget.h | 1 +
- plugins/externalscript/editexternalscript.cpp      | 1 +
- plugins/git/gitnameemaildialog.cpp                 | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/plugins/debuggercommon/widgets/disassemblewidget.h b/plugins/debuggercommon/widgets/disassemblewidget.h
-index e8d32ef..543b69f 100644
---- a/plugins/debuggercommon/widgets/disassemblewidget.h
-+++ b/plugins/debuggercommon/widgets/disassemblewidget.h
-@@ -26,6 +26,7 @@
- 
- #include "mi/mi.h"
- 
-+#include <QActionGroup>
- #include <QTreeWidget>
- #include <QUrl>
- 
-diff --git a/plugins/externalscript/editexternalscript.cpp b/plugins/externalscript/editexternalscript.cpp
-index 5ec756b..2c0de28 100644
---- a/plugins/externalscript/editexternalscript.cpp
-+++ b/plugins/externalscript/editexternalscript.cpp
-@@ -23,6 +23,7 @@
- 
- #include "externalscriptitem.h"
- 
-+#include <QAction>
- #include <QDialogButtonBox>
- #include <QPushButton>
- 
-diff --git a/plugins/git/gitnameemaildialog.cpp b/plugins/git/gitnameemaildialog.cpp
-index ba24a70..ddba09c 100644
---- a/plugins/git/gitnameemaildialog.cpp
-+++ b/plugins/git/gitnameemaildialog.cpp
-@@ -27,6 +27,8 @@
- 
- #include <QDialog>
- #include <QPushButton>
-+#include <QRegularExpression>
-+#include <QValidator>
- 
- using namespace KDevelop;
- 
--- 
-cgit v0.11.2
-
diff --git a/dev-util/kdevelop/kdevelop-5.2.1.ebuild b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
deleted file mode 100644
index 93a5bc5f7b99..000000000000
--- a/dev-util/kdevelop/kdevelop-5.2.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-REQUIRED_USE="test? ( welcomepage )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qthelp)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	>=sys-devel/clang-3.8.0:=
-	x11-misc/shared-mime-info
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( kde-frameworks/purpose )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	cvs? ( dev-vcs/cvs )
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop:4
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-cppcheck
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
-	!dev-util/kdevplatform
-	!<kde-apps/kapptemplate-16.04.0
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_cvs=$(usex cvs)
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-}
diff --git a/dev-util/kdevelop/kdevelop-5.2.3.ebuild b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
index 19601d8672b7..c8c5c9567be5 100644
--- a/dev-util/kdevelop/kdevelop-5.2.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
@@ -13,7 +13,7 @@ inherit kde5
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
 IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 REQUIRED_USE="test? ( welcomepage )"