gentoo resync : 17.12.2017

5 files changed, 3 insertions, 111 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 3205668ad4d0..165fc72f23ff 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,8 +1,5 @@
-AUX kdevelop-5.0.2-ninja-optional.patch 426 BLAKE2B a3e85bb1e6c1a09820a412c23497acf840a3dcdbc4a07690e42b4913940de1fc99743a9a0ece5c3f2d341969696b00dab7bf993d21c5e3d01e7af48956faa131 SHA512 7c54ca466ac8afae7ced2798182104977f1a41de884afb8e52b6b23ba60f87a184b7898cc991de1211e8a194343396851d50c25fa60ff69205731725074bf19c
-DIST kdevelop-5.1.1.tar.xz 4685416 BLAKE2B 423e18e5d6f87305b5261c5616344a148a081759230903e77196b1dbaf0c5a3835609505004db925596e037c89901d81f8200efa90b75ae66b7dfb3b38f6fefe SHA512 e2c1a4885bab9815341a53da6a98dd4939b7128eee174e79c616cc020f464362a2730508b3a8d66f00e4ea95f2098b92d6328b43b9f22bd77145bbe6ce096529
 DIST kdevelop-5.1.2.tar.xz 4688696 BLAKE2B 6ad2fa04bbeba54b92cfc3be48d21ad6bd22158b588e0342a5a00d7f3122f9261e40103fdfa622ba29114e86f6b36d335ffacf56de14ec430ff6a7eb23590bd5 SHA512 3f359587c7dca3ad4d0db4940cc9557bb61647672432f21c21d6f493e5e5c96e026c7dc155b66a7be4d20b06972fe961d8a3dda28e8aa273d0a4044a6242e39b
 DIST kdevelop-5.2.1.tar.xz 6653576 BLAKE2B 800ab50b62ca70e54d66bc7956b257e6d14f5a2c2fda7c7720aa0ddf1dad1dd2d7f993103c7f4caed0fc78734643a89f2710cb598319695d9ea6d79f62fd6305 SHA512 ee4a7f93c4f5168e6c63ca415a1f757cb7d2615370201700db16abdf1799e5c12421e382f5937be4a65af026a00df679b745fc4dab4d73974275d95d53173cd0
-EBUILD kdevelop-5.1.1.ebuild 2562 BLAKE2B 26c41b84bdaea24d33f6699aafcca4347b5413d43b34de4a350c26df258a7aa55bb6d75076521792e12d86674c8fc8068b0ee97a2b7ea9e98f2f88e6c620dc38 SHA512 f7d3ad87391cc509ffaefc5d9308ad7cabbd4faabef68acf1ab0e00259526014bcc100a686879e796cbed99090bbf354a7bb5493a8dba356a4b31581c6942e26
-EBUILD kdevelop-5.1.2.ebuild 2569 BLAKE2B e5b29d93559abb7ed6e166a5dacbabe553553dd45aecde50cea549882789053b775503cda723fa4d24c8e652d895c4556c59009dc691ae280bf3692a523dd71d SHA512 2ab9ac37d94e4a313f9d1f375875043b2f6439150c91ed66207a13392152ebd9d990c71979cb7b2071612aa0a6097c9d2ffd89de0ff181e1652793771449a200
+EBUILD kdevelop-5.1.2.ebuild 2568 BLAKE2B 1b8c0c5dbb25f022cd088301419a65f99a8502e3b09551f8e7b6f896f4d662eadb562e8f9f9d1be43ee078c2d43d7aff5821fa3435cee5c8c83f2bd26f90a9db SHA512 57ca3389455999bab6baa88e35b8f54af7f49a529311ea44b39b20985de16763c29d1366e4933b432fc810673c359888ba30f1a8d8486bac43b787050f5e0d2f
 EBUILD kdevelop-5.2.1.ebuild 3811 BLAKE2B 6719332daba66380ab746e440a37d819109fc13fcb3ca95d4130c4ff4743b2e08d8dfd0ac07c767e57feb5392aabe4467fd54061fc6dc12c14b25482282ec2a2 SHA512 3d592f4d8e0842a8ad6c30d41c02f6e58a2a579613c815420d70b3903ceb4086ffd8cc160b2f0270926af89b1dc0a4f5c619c14f5934e3f2e1fa4089f5c09869
-MISC metadata.xml 938 BLAKE2B 1668e83cc592385476c911d4cef0e21ae8c93296ce85596a7c39e5dc15fcc853b503c4e6151a0eb02416ba7189fc1f9c3f59d0dd351f0a7e85249371a0be6178 SHA512 8dc8349b457c1fe70d71adf9a31d387ac3008444275d919cc511b548461b0c66dfd30ec5a025988138f3d1b780beca9f958407973d192c110c0a00eb51c27856
+MISC metadata.xml 794 BLAKE2B 765d868d9ca5ac71ee71a7c22d85beb02951dd7a601c2d52da87b1d49686494e8ce17c9e7e0f5f2767e0cb02625d74bcc6a95cfe3ae6793298150fcb651fcae4 SHA512 4d96ffa2a718e987a2d61531fe4a194c3fca3e863ab9cf8ac59d3b187a526c841066936f0a92591475672c6c22b57bd04a798908932f839644025b615ce8b417
diff --git a/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch b/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch
deleted file mode 100644
index a60da91df6dc..000000000000
--- a/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/projectbuilders/CMakeLists.txt b/projectbuilders/CMakeLists.txt
-index 80d7866..825ca8b 100644
---- a/projectbuilders/CMakeLists.txt
-+++ b/projectbuilders/CMakeLists.txt
-@@ -1,5 +1,5 @@
- add_subdirectory(makebuilder)
--add_subdirectory(ninjabuilder)
-+ecm_optional_add_subdirectory(ninjabuilder)
- ecm_optional_add_subdirectory(cmakebuilder)
- if (KDevelop-PG-Qt_FOUND)
-     ecm_optional_add_subdirectory(qmakebuilder)
diff --git a/dev-util/kdevelop/kdevelop-5.1.1.ebuild b/dev-util/kdevelop/kdevelop-5.1.1.ebuild
deleted file mode 100644
index 681bc3245037..000000000000
--- a/dev-util/kdevelop/kdevelop-5.1.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.1"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+gdbui +ninja okteta +plasma +qmake qthelp"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 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 knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-util/kdevplatform-${PV}:5
-	>=sys-devel/clang-3.5.0:*
-	x11-misc/shared-mime-info
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	okteta? ( $(add_kdeapps_dep okteta) )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	qthelp? ( $(add_qt_dep qthelp) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	>=sys-devel/gdb-7.0[python]
-	ninja? ( dev-util/ninja )
-	!dev-util/kdevelop:4
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-cppcheck
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
-	!<kde-apps/kapptemplate-16.04.0
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		-DBUILD_ninjabuilder=$(usex ninja)
-		$(cmake-utils_use_find_package okteta OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		-DBUILD_qthelp=$(usex qthelp)
-	)
-
-	kde5_src_configure
-}
diff --git a/dev-util/kdevelop/kdevelop-5.1.2.ebuild b/dev-util/kdevelop/kdevelop-5.1.2.ebuild
index 78ec5c34f14f..ef8eb890dd72 100644
--- a/dev-util/kdevelop/kdevelop-5.1.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.1.2.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
 IUSE="+gdbui okteta +plasma +qmake"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index 75711dc9844c..a5bf469b2fbb 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -7,10 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
-		<flag name="ninja">Enable support for Ninja build system</flag>
 		<flag name="okteta">Enable hex editor plugin via <pkg>kde-apps/okteta</pkg></flag>
 		<flag name="qmake">Enable support for QMake build system</flag>
-		<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
 		<flag name="reviewboard">Enable reviewboard support</flag>
 		<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
 		<flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag>