7 files changed, 8 insertions, 202 deletions
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 47350368c439..2f6dc573079c 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1 @@
-DIST kdevelop-4.5.2.tar.xz 4901660 SHA256 d157224a81c886cbe32d25600a29042a6fec1e0c535202dc85748cd15877fe30 SHA512 6bb1103e739f33f07e7c5278b284a5f991c9537acb94b7e103a449a7702ea97a0daf2d4fe7c24aeb45e6dfff3af7fc7accc67815283d28e20bf1c15206dbdc0e WHIRLPOOL 5de50b372b75f29118aef58114d5ac3f7a69b043a95c1233f11886412625ccaca6090bc28426eaf31cb26c30a0177bc4c7753b2fec26ae019120cde7fa9c4217
-DIST kdevelop-4.6.0.tar.xz 4867960 SHA256 1ee9e7b8c46f575dd29d920cfd6284130f2e738a2e1f52dfd97b075fab2e4c73 SHA512 0d2239f4fdf9b78e757161911e44cbf9543347cf291504adde8b5d46390993ba907b55aa0653ba3b0de3d9aad949a7c7135b6626c1e733f9f2b7cc013b09eb77 WHIRLPOOL 8cf4562fbe0a3d87bd5ab0c03b0907fa7777db2909f0511f065cc6ec52deb24a12cd7d234125d000803f4897ffada0b614b1a0eefcc3acec558d05192670ce91
 DIST kdevelop-4.7.1.tar.xz 4441540 SHA256 e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1 SHA512 a5fcdb4b83f6b9512350d73314df3ed8fd4f8a6544f358c480295f1f1f81799f18e30b44c24b73b4db244e63f01c29990854532688bf0a866c7fe83f924a48bd WHIRLPOOL 630802a540db94a6f56b0c15ff8910ea6168401f88aaf3e14476461d169f4e456f83444fbf8f9c927c7c196b0797c40d58972d1b05a912eeb18d8d5b1239e4f9
diff --git a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
deleted file mode 100644
index b45623623a23..000000000000
--- a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit fb4234cd72ceebb200bef13234ea9c36c9a62046
-Author: Kevin Funk <kevin@kfunk.org>
-Date:   Sun Nov 3 22:09:56 2013 +0100
-
-    Check if kdevplatform has JSON support
-    
-    BUG: 327095
-
-diff --git a/languages/cpp/tests/CMakeLists.txt b/languages/cpp/tests/CMakeLists.txt
-index 84ce3ee..fbdd4db 100644
---- a/languages/cpp/tests/CMakeLists.txt
-+++ b/languages/cpp/tests/CMakeLists.txt
-@@ -55,7 +55,9 @@ target_link_libraries(buddiestest
- ########### next target ###############
- 
- find_package(QJSON)
--if(QJSON_FOUND)
-+# Also check that kdevplatform is built with JSON support
-+# see: https://bugs.kde.org/show_bug.cgi?id=327095
-+if(QJSON_FOUND AND KDEVPLATFORM_JSONTESTS_LIBRARIES)
-   set(cppfilestest_SRCS test_cppfiles.cpp)
-   kde4_add_unit_test(cppfilestest ${cppfilestest_SRCS})
-   configure_file("testfilepaths.h.cmake" "testfilepaths.h" ESCAPE_QUOTES)
-@@ -67,7 +69,7 @@ if(QJSON_FOUND)
-       ${KDEVPLATFORM_JSONTESTS_LIBRARIES}
-       kdev4cppduchain
-   )
--endif(QJSON_FOUND)
-+endif()
- 
- ########### next target ###############
- 
diff --git a/dev-util/kdevelop/kdevelop-4.5.2.ebuild b/dev-util/kdevelop/kdevelop-4.5.2.ebuild
deleted file mode 100644
index 58f0d403a8db..000000000000
--- a/dev-util/kdevelop/kdevelop-4.5.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta qthelp reviewboard"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 ppc x86"
-fi
-
-DEPEND="
-	>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}[reviewboard?]
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	okteta? ( $(add_kdeapps_dep okteta) )
-	qthelp? ( dev-qt/qthelp:4 )
-	reviewboard? ( dev-libs/qjson )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kdebase-kioslaves)
-	dev-qt/qtdeclarative:4[webkit]
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-PATCHES=( "${FILESDIR}/${P}-kdevplatform-without-qjson.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
-		$(cmake-utils_use_find_package reviewboard QJSON)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/kdevelop-4.6.0.ebuild b/dev-util/kdevelop/kdevelop-4.6.0.ebuild
deleted file mode 100644
index 9161fabaf991..000000000000
--- a/dev-util/kdevelop/kdevelop-4.6.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv th uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta qthelp"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-DEPEND="
-	dev-libs/qjson
-	>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	okteta? ( $(add_kdeapps_dep okteta) )
-	qthelp? ( dev-qt/qthelp:4 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kdebase-kioslaves)
-	dev-qt/qtdeclarative:4[webkit]
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild b/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
index 40a5657c6c9a..a2324543f780 100644
--- a/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2 LGPL-2"
 IUSE="+cmake +cxx debug +gdbui okteta qthelp"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~ppc x86"
+	KEYWORDS="amd64 ppc x86"
 fi
 
 DEPEND="
diff --git a/dev-util/kdevelop/kdevelop-4.7.1.ebuild b/dev-util/kdevelop/kdevelop-4.7.1.ebuild
deleted file mode 100644
index addf588c8ccd..000000000000
--- a/dev-util/kdevelop/kdevelop-4.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
-VIRTUALX_REQUIRED="test"
-EGIT_BRANCH="4.7"
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug +gdbui okteta qthelp"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-DEPEND="
-	dev-libs/qjson
-	dev-qt/qtdeclarative:4[webkit]
-	gdbui? (
-		$(add_kdebase_dep ksysguard)
-		$(add_kdebase_dep libkworkspace)
-	)
-	okteta? ( $(add_kdeapps_dep okteta) )
-	qthelp? ( dev-qt/qthelp:4 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kdebase-kioslaves)
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with gdbui KDE4Workspace)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index ced196a367bd..d6717c393ca4 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<use>
-	<flag name="cmake">Enable support for CMake build system</flag>
-	<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
-	<flag name="okteta">Enable hex editor plugin</flag>
-	<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
-	<flag name="reviewboard">Enable reviewboard support</flag>
-</use>
+	<herd>kde</herd>
+	<use>
+		<flag name="cmake">Enable support for CMake build system</flag>
+		<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
+		<flag name="okteta">Enable hex editor plugin</flag>
+		<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
+	</use>
 </pkgmetadata>