[dev-util/kdevelop*,kdevplatform] Synchronize with new eclass code (bumping should be as easy as kde-base stuff)

3 files changed, 56 insertions, 11 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 8f1864f679a..2d92d2d1057 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,2 +1,4 @@
-EBUILD kdevelop-9999.ebuild 1602 RMD160 c1f13e909d8e0049cd3f4876cea340f55ca4b6b2 SHA1 22c200e6503f5d6ceffc2b4b23f19f9c40a7a4bc SHA256 7116513d0ef4d8c8616d63ad61fc7a06fe5c8513b7bac951a9d81cd52b5d1877
+DIST kdevelop-4.0.0.tar.bz2 4679166 RMD160 64b0ded219fa630c61833b0289ecedc54619eb3b SHA1 2b269409769f2332e795547b0be786873035b41f SHA256 d7b51b0ed4671eb1b0b19129f11d9aa11c8bcc1bee4b76c28d7ac670a683dc32
+EBUILD kdevelop-4.0.0.ebuild 1311 RMD160 90e6c4c48bdf0ca856aeb2e345f8aea01b73486c SHA1 8de9c2942ec9cd3b09462280816cd9da35e839cf SHA256 039b84f5b88ca968b54dc8ac68e9721e688b49f2518d0b0c17175d9d0f1c9066
+EBUILD kdevelop-9999.ebuild 1300 RMD160 440454c99315016e11dd1dd225d836e233635d71 SHA1 dfab12a68b4725b55e31acef89d51354f640bd08 SHA256 6b6053356e7bf624aef38c8997b6de1fb3d6704d8083ed38f9529ebb89e4f0b0
 MISC metadata.xml 376 RMD160 6b9329543283c9b82e6dc26b95275c4cf993f8ba SHA1 98f1e3e0cf2c4cfe031a577c99f71dcf4956212e SHA256 1c331e23f3aaada0aab789aaee4314d6011f713d4697f904ed29e7daf8f61b1b
diff --git a/dev-util/kdevelop/kdevelop-4.0.0.ebuild b/dev-util/kdevelop/kdevelop-4.0.0.ebuild
new file mode 100644
index 00000000000..edfb919d442
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-4.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="ca ca@valencia da de en_GB es et fr gl it nds pt pt_BR sv tr uk zh_CN zh_TW"
+fi
+
+KMNAME="kdevelop"
+inherit kde4-base
+
+DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
+
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cmake +cxx debug +qmake qthelp"
+
+DEPEND="
+	>=kde-base/ksysguard-${KDE_MINIMAL}
+	>=kde-base/libkworkspace-${KDE_MINIMAL}
+	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )
+"
+RDEPEND="${DEPEND}
+	>=kde-base/kapptemplate-${KDE_MINIMAL}
+	cxx? ( >=sys-devel/gdb-7.0[python] )
+"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Remove this and the ksysguard dep after libprocessui moved into kdelibs
+	sed -i -e 's/${KDE4WORKSPACE_PROCESSUI_LIBS}/processui/g' \
+		debuggers/gdb/CMakeLists.txt \
+		|| die "Failed to patch CMake files"
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build cmake)
+		$(cmake-utils_use_build cmake cmakebuilder)
+		$(cmake-utils_use_build qmake)
+		$(cmake-utils_use_build qmake qmakebuilder)
+		$(cmake-utils_use_build qmake qmake_parser)
+		$(cmake-utils_use_build cxx cpp)
+		$(cmake-utils_use_build qthelp)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 12681e74b10..34eab0a3c97 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -4,28 +4,20 @@
 
 EAPI="2"
 
-if [[ ${PV} == *9999* ]]; then
-	KDEVPLATFORM_PV="9999"
-else
+if [[ ${PV} != *9999* ]]; then
 	KDE_LINGUAS="ca ca@valencia da de en_GB es et fr gl it nds pt pt_BR sv tr uk zh_CN zh_TW"
-	inherit versionator
-	KDEVPLATFORM_PV="$(($(get_major_version)-3)).$(get_after_major_version)"
 fi
 
-KMNAME="extragear/sdk"
+KMNAME="kdevelop"
 inherit kde4-base
 
 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
-HOMEPAGE="http://www.kdevelop.org/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
-SLOT="4"
 IUSE="+cmake +cxx debug +qmake qthelp"
 
 DEPEND="
-	>=dev-util/kdevplatform-${KDEVPLATFORM_PV}
 	>=kde-base/ksysguard-${KDE_MINIMAL}
 	>=kde-base/libkworkspace-${KDE_MINIMAL}
 	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )