gentoo resync : 14.07.2018

4 files changed, 2 insertions, 84 deletions

diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 98fe9ea4a5fa..450fe2076d33 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,6 +1,3 @@
-AUX kdevelop-python-5.2.1-qt-5.11.patch 715 BLAKE2B f2b8b9c3bdcefaedae0c3865abb55486f2c071ac3d6a4ba69361f34878dd2e84908cab8fbd02cfd4793b45eeec1f1ab07191799b341c537bce4d4a9eb22e1deb SHA512 ab06b40d1ff846ef5e48ce1f28834e96b406f740e125d5a4fa2ef56c69f6ce632f5d2a2db1b1100c836c722943de2bd94959b3e27626037ad417c1dbc52281ae
-DIST kdev-python-5.2.1.tar.xz 1070708 BLAKE2B c1381e2a692446ac544e5e837236d90d5250c5b854f982374ff3c195d6d42d6534f6f81b118e872fbe4bea3f15e81b5396f3b581d6a64bf224e1a5ec631b9a89 SHA512 e65317a7da59cfaa5c14f0c10f965b1d7167e1e4e1b553f4c5f2ad9bce6d0ddbd93267cd9707a81a63117016fbc4dff77bca4ff2b2680ae585eb0f7354f3cf23
 DIST kdev-python-5.2.3.tar.xz 1071116 BLAKE2B 5d271c98d3d516a2fa9dda8995b4f3215dee5803417d95bab1c811a73c18becce779d0d3185584eb2116b1152ce3020a3704d7b71bc801712c35154531447ab6 SHA512 fd869ec93d544f2c16883bf95fb694fe75582dec3bb55d661de3f5fe9dc2d692439ef9cae9039bffb0e1a85d645eef228da869694110323b3ba56d78df2def61
-EBUILD kdevelop-python-5.2.1.ebuild 1214 BLAKE2B b2b0c1d64e5e394ce7f8f443e8acd4966bc68bf23145ff8fa155ba74ea33562017fdebd3699b254a36d7aaed74b8b75a74a0f68f67205f7e9d57ff5dab245143 SHA512 311770f9efee7128aec66cbd7473eb0877c329c3a6e0c016cf0128da875e0dfd7edb527ed9b8a442655b11ace67469f5efc3691d7a6221813f92b8ed12b52d58
-EBUILD kdevelop-python-5.2.3.ebuild 1169 BLAKE2B 5910e453139190aa547d826286b13308fcdc636412b8c05cbf6718bf657a3899080c1a0f21bbf083d4eb2bfb139f9e7cf98efe98b4713ade3e84e8c077ec2560 SHA512 6b4d138c32e549e19acaf62760d897bb7fb2f1e553912ae480a1876b793a988152961ca921fb797fa0dba8f758b8b200087785036cbb6dbe749ae5275d528a3e
+EBUILD kdevelop-python-5.2.3.ebuild 1168 BLAKE2B e6e88767249fd607486ad0bf766caa1305a352c21a5f7c8feea95c2ee017c943c9f316f1c5084fd0c7924ac6d1d523dfc3ec2f198768ac005b218f22d5f0123d SHA512 083555b74b7af5d028a7b690d30a46c202f19125a0a5a519d5237a406c06bfdea76bb28e8e80bb56499f3442fa87da4e078ff22c0595b2b372cc788792aa6a8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/files/kdevelop-python-5.2.1-qt-5.11.patch b/dev-util/kdevelop-python/files/kdevelop-python-5.2.1-qt-5.11.patch
deleted file mode 100644
index 67528c558504..000000000000
--- a/dev-util/kdevelop-python/files/kdevelop-python-5.2.1-qt-5.11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a4a3cfb040054e7ca938bdd593c6c3c80d80807f Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Thu, 10 May 2018 06:55:07 +0200
-Subject: Fix build with Qt 5.11
-
-Some includes were added transitively, now they need to be explicit.
----
- codegen/correctionfilegenerator.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/codegen/correctionfilegenerator.cpp b/codegen/correctionfilegenerator.cpp
-index bb79a25..53ebec4 100644
---- a/codegen/correctionfilegenerator.cpp
-+++ b/codegen/correctionfilegenerator.cpp
-@@ -20,6 +20,7 @@
- 
- #include "correctionfilegenerator.h"
- 
-+#include <QAction>
- #include <QTemporaryFile>
- 
- #include <language/backgroundparser/backgroundparser.h>
--- 
-cgit v0.11.2
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
deleted file mode 100644
index 11bbd220000a..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
+++ /dev/null
@@ -1,55 +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_TEST="forceoptional"
-KDEBASE="kdevelop"
-KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop:5
-"
-RDEPEND="${DEPEND}
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_compile() {
-	pushd "${WORKDIR}"/${P}_build > /dev/null || die
-	emake parser
-	popd > /dev/null || die
-
-	kde5_src_compile
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild
index 1ce3f2fe1206..ba7fd2bc14f1 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild
@@ -12,7 +12,7 @@ inherit kde5 python-single-r1
 
 DESCRIPTION="Python plugin for KDevelop"
 IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"