ebuilds of the beta release of kdevelop 3.2

15 files changed, 437 insertions, 2 deletions

diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
new file mode 100644
index 00000000000..b644cf735f3
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -0,0 +1 @@
+DIST kdevelop-pg-qt-v0.9.82.tar.bz2 829941 SHA256 89777d89cfabc3a8c6427d590ac242bb759b102e3226ff334837d9c375793716 SHA512 85f225ffca47a0b0266cdce85fb6c4e9d7b4fc4f96e96095b0ed2af9d35878071068cb8c5402ffdc9c23528c4442140501ca2903ca82c67b2435e8bc820645eb WHIRLPOOL 7530026ad4f522d3277eaf37369763711296dae56f753130eb94fbc325b98f490d8d294f6bd91a218a2ac85636073ccc324b2e964922f237bab16d03fdc9df49
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-0.9.82.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-0.9.82.ebuild
new file mode 100644
index 00000000000..148bb1ddcc8
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-0.9.82.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM=git
+inherit kde4-base
+
+EGIT_REPO_URI="git://anongit.kde.org/kdevelop-pg-qt.git"
+EGIT_COMMIT="v${PV}"
+
+DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
+HOMEPAGE="http://www.kdevelop.org"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${PN}-v${PV}.tar.bz2"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND=""
+DEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+S=${WORKDIR}/${PN}-v${PV}
+#PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )
diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
new file mode 100644
index 00000000000..ddc53f5ce28
--- /dev/null
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -0,0 +1 @@
+DIST kdevelop-php-docs-1.2.81.tar.bz2 29811 SHA256 f89e24891a35b1dbf8d4e15f515dfe8dfc3c14a65c0ffa2181d787a4b79c3823 SHA512 6f303d6415353f7607f33ef35ada4699e71d432d0ccdf005d9a265c6ca307f9eaf690768507a9b49a583b21fb0d06aa95b0ea4b8af08fdf11a6c3c82870931b4 WHIRLPOOL 5a22f73a336ff33900850b8afa43a2952627c1a16c52645add5059b9ebd1f31eef8c0a7bfbfc463180856954ce17082cf291936682fbf8994c58ce4be8a868ff
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.2.81.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.2.81.ebuild
new file mode 100644
index 00000000000..64e3c7c6a63
--- /dev/null
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.2.81.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_LINGUAS="ca ca@valencia da de en_GB es et fr gl it nb nds nl pt pt_BR ru sv uk zh_CN zh_TW"
+
+KMNAME="kdevelop"
+KMMODULE="php-docs"
+#KDEVELOP_VERSION="4.2.3"
+inherit kde4-base
+
+DESCRIPTION="PHP documentation plugin for KDevelop 4"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
new file mode 100644
index 00000000000..614823697b1
--- /dev/null
+++ b/dev-util/kdevelop-php/Manifest
@@ -0,0 +1 @@
+DIST kdevelop-php-1.2.81.tar.bz2 670574 SHA256 46abdd48b2fd6832fd540a7885960e065d3ed0f7c58195e0b9cedb855f481e59 SHA512 f7e484a422bca8cb37ae4e0b09cd86103792e0c80b0cd4f6e2b71d50464d92fbe084c364478155225f79104d26ff90adbd67476d13995b750e89c4ac55396463 WHIRLPOOL 45c82e2e5592ad4bd2dbaa493244d2403439704e34e0f09dfc3da4ccb77ff2b70b3dff7edaf81b04c8a1b08b349195e961bb5e7ca46bddc3f4ac6228ea127536
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch
new file mode 100644
index 00000000000..d3bb404c2f6
--- /dev/null
+++ b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch
@@ -0,0 +1,98 @@
+diff -ruN kdevelop-php-1.2.0.orig/completion/tests/CMakeLists.txt kdevelop-php-1.2.0/completion/tests/CMakeLists.txt
+--- kdevelop-php-1.2.0.orig/completion/tests/CMakeLists.txt	2011-01-23 20:42:54.000000000 +0100
++++ kdevelop-php-1.2.0/completion/tests/CMakeLists.txt	2011-03-05 18:01:34.000000000 +0100
+@@ -8,24 +8,6 @@
+ 
+ set(completiontest_SRCS test_completion.cpp
+     ../../duchain/tests/duchaintestbase.cpp)
+-kde4_add_unit_test(completiontest ${completiontest_SRCS})
+-target_link_libraries(completiontest
+-    kdev4phpcompletion
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+ 
+ set(completionbench_SRCS bench_completion.cpp
+     ../../duchain/tests/duchaintestbase.cpp)
+-kde4_add_unit_test(completionbenchmark ${completionbench_SRCS})
+-target_link_libraries(completionbenchmark
+-    kdev4phpcompletion
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+diff -ruN kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt kdevelop-php-1.2.0/duchain/tests/CMakeLists.txt
+--- kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt	2011-01-23 20:42:54.000000000 +0100
++++ kdevelop-php-1.2.0/duchain/tests/CMakeLists.txt	2011-03-05 17:54:27.000000000 +0100
+@@ -9,66 +9,21 @@
+ set(duchain_SRCS
+     duchain.cpp
+     duchaintestbase.cpp)
+-kde4_add_unit_test(duchain ${duchain_SRCS})
+-target_link_libraries(duchain
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+-
+ 
+ set(expressionparser_SRCS
+     expressionparser.cpp
+     duchaintestbase.cpp)
+-kde4_add_unit_test(expressionparser ${expressionparser_SRCS})
+-target_link_libraries(expressionparser
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+ 
+ set(uses_SRCS
+     uses.cpp
+     duchaintestbase.cpp)
+-kde4_add_unit_test(uses ${uses_SRCS})
+-target_link_libraries(uses
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+ 
+ set(benchmarks_SRCS
+     benchmarks.cpp
+     duchaintestbase.cpp
+ )
+-kde4_add_unit_test(benchmarks ${benchmarks_SRCS})
+-target_link_libraries(benchmarks
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+-
+ 
+ set(duchain_multiplefiles_SRCS
+     duchain_multiplefiles.cpp
+     duchaintestbase.cpp
+ )
+-kde4_add_unit_test(duchain_multiplefiles ${duchain_multiplefiles_SRCS})
+-target_link_libraries(duchain_multiplefiles
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
new file mode 100644
index 00000000000..4e64c9fad50
--- /dev/null
+++ b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
@@ -0,0 +1,12 @@
+diff -ruN kdevelop-php-1.2.0.orig/parser/CMakeLists.txt kdevelop-php-1.2.0/parser/CMakeLists.txt
+--- kdevelop-php-1.2.0.orig/parser/CMakeLists.txt	2011-01-23 20:42:54.000000000 +0100
++++ kdevelop-php-1.2.0/parser/CMakeLists.txt	2011-04-25 22:29:05.486182541 +0200
+@@ -21,6 +21,8 @@
+     ${KDE4_KTEXTEDITOR_LIBS}
+ )
+ 
++add_dependencies( kdev4phpparser php-parser-generated )
++
+ kde4_add_executable( php-parser main.cpp )
+ target_link_libraries(php-parser ${QT_QTCORE_LIBRARY} ${KDEVPLATFORM_TESTS_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} kdev4phpparser)
+ 
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.2.81.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.2.81.ebuild
new file mode 100644
index 00000000000..e4959fc1e5a
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-1.2.81.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+# Bug 330051
+# RESTRICT="test"
+
+KDE_LINGUAS="ca ca@valencia da de en_GB es et fr it nb nds nl pt pt_BR sv th uk zh_CN zh_TW"
+
+KMNAME="kdevelop"
+KMMODULE="php"
+#KDEVELOP_VERSION="4.2.3"
+VIRTUALX_REQUIRED=test
+inherit kde4-base
+
+DESCRIPTION="PHP plugin for KDevelop 4"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug doc"
+
+DEPEND="
+	>=dev-util/kdevelop-pg-qt-0.9.82
+"
+RDEPEND="
+	dev-util/kdevelop
+	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
+"
+
+PATCHES=( "${FILESDIR}/${PN}"-1.2.0-{dbustests,parmake}.patch )
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
new file mode 100644
index 00000000000..33ce37092ea
--- /dev/null
+++ b/dev-util/kdevelop/Manifest
@@ -0,0 +1 @@
+DIST kdevelop-4.2.81.tar.bz2 8121062 SHA256 95a248ad66ac5688f0b883431e3da9a0a13b1a06d1b0cd3fb8cbb429b68d01ba SHA512 3c265b28bee714f5914373ba09ab18167206f26ff1c01931397bc821a8677ae1075834cad588a5032c11fd52e10edc2bafbb072ffe4e95dd11dda430bc7c6671 WHIRLPOOL a843480d0a9ee5f534c3d27e2507d55b5f640c8a3506a2a967809bd03ff8a0d3aeab9e9ae75e2c16ce227c0984f80e91a169f2d090a5cdd65b7fc08c12c3546a
diff --git a/dev-util/kdevelop/kdevelop-4.2.81.ebuild b/dev-util/kdevelop/kdevelop-4.2.81.ebuild
new file mode 100644
index 00000000000..c78c5f42711
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-4.2.81.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_LINGUAS="ca ca@valencia da de en_GB es et fr it nb nds nl pt pt_BR ru 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."
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LICENSE="GPL-2 LGPL-2"
+IUSE="+cmake +cxx debug okteta +qmake qthelp"
+
+# Remove ksysguard dep after libprocessui moved into kdelibs
+DEPEND="
+	=dev-util/kdevplatform-1.2.81[subversion]
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	okteta? ( $(add_kdebase_dep okteta) )
+	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kapptemplate)
+	cxx? ( >=sys-devel/gdb-7.0[python] )
+"
+# see bug 347547 about the kdevplatform[subversion] dependency
+
+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 qmake)
+		$(cmake-utils_use_build qmake qmakebuilder)
+		$(cmake-utils_use_build qmake qmake_parser)
+		$(cmake-utils_use_build qthelp)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
new file mode 100644
index 00000000000..cb20f5bd76b
--- /dev/null
+++ b/dev-util/kdevplatform/Manifest
@@ -0,0 +1 @@
+DIST kdevplatform-1.2.81.tar.bz2 1971569 SHA256 32e09c7ab871d4c851856442d3ad3ad16b0a2a7214866ac5e7a76533f28ffcf1 SHA512 62bd087c3dd952d86e13013df1ab958c13860e4f413f76d36e06e7ae93dd9bf0c8728e55f7c1042489cb1e5ea406b6818d245babd0cb358429c78b922b620720 WHIRLPOOL 4aecd361e5c2b3aed93098c2e4769b07752d23517dfe63458b517b4be326dde46b755b1c59260063cde7ce371476b2f21032666ec965d309561cb9af64346ae2
diff --git a/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-1.patch b/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-1.patch
new file mode 100644
index 00000000000..c1ca7582e19
--- /dev/null
+++ b/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-1.patch
@@ -0,0 +1,32 @@
+commit 74dec52749e3c3af2ac6492f50e2676128f35b27
+Author: Milian Wolff <mail@milianw.de>
+Date:   Fri Nov 18 16:26:06 2011 +0100
+
+    fix svn api usage: use svn_dirent_canonicalize instead of svn_path_internal_style
+    
+    this was suggested by Stephan Sperling
+    
+    CCBUG: 284061
+
+diff --git a/plugins/subversion/kdevsvncpp/path.cpp b/plugins/subversion/kdevsvncpp/path.cpp
+index eaa84c1..4dced08 100644
+--- a/plugins/subversion/kdevsvncpp/path.cpp
++++ b/plugins/subversion/kdevsvncpp/path.cpp
+@@ -24,6 +24,7 @@
+ 
+ // subversion api
+ #include "svn_path.h"
++#include "svn_dirent_uri.h"
+ 
+ // apr api
+ #include "apr_file_io.h"
+@@ -63,8 +64,7 @@ namespace svn
+       m_path = "";
+     else
+     {
+-      const char * int_path =
+-        svn_path_internal_style(path, pool.pool());
++      const char * int_path = svn_dirent_canonicalize(path, pool);
+ 
+       m_path = int_path;
+ 
diff --git a/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-2.patch b/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-2.patch
new file mode 100644
index 00000000000..a240eedc438
--- /dev/null
+++ b/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-2.patch
@@ -0,0 +1,95 @@
+commit cc7f0798d314cdac14b90e427abe22e99c6bd591
+Author: Milian Wolff <mail@milianw.de>
+Date:   Fri Nov 18 16:23:36 2011 +0100
+
+    properly initialize client context for compatibility with subversion API
+    
+    this should hopefully fix the crash with svn 1.7 in kdevelop, please test
+    
+    BUG: 284061
+
+diff --git a/plugins/subversion/kdevsvncpp/context.cpp b/plugins/subversion/kdevsvncpp/context.cpp
+index d277591..ddbb657 100644
+--- a/plugins/subversion/kdevsvncpp/context.cpp
++++ b/plugins/subversion/kdevsvncpp/context.cpp
+@@ -65,7 +65,7 @@ public:
+     bool logIsSet;
+     int promptCounter;
+     Pool pool;
+-    svn_client_ctx_t ctx;
++    svn_client_ctx_t * ctx;
+     std::string username;
+     std::string password;
+     std::string logMessage;
+@@ -205,26 +205,26 @@ public:
+       svn_auth_open(&ab, providers, pool);
+ 
+       // initialize ctx structure
+-      memset(&ctx, 0, sizeof(ctx));
++      svn_client_create_context(&ctx, pool);
+ 
+       // get the config based on the configDir passed in
+-      svn_config_get_config(&ctx.config, c_configDir, pool);
++      svn_config_get_config(&ctx->config, c_configDir, pool);
+ 
+       // tell the auth functions where the config is
+       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR,
+                              c_configDir);
+ 
+-      ctx.auth_baton = ab;
+-      ctx.log_msg_func = onLogMsg;
+-      ctx.log_msg_baton = this;
+-      ctx.notify_func = onNotify;
+-      ctx.notify_baton = this;
+-      ctx.cancel_func = onCancel;
+-      ctx.cancel_baton = this;
++      ctx->auth_baton = ab;
++      ctx->log_msg_func = onLogMsg;
++      ctx->log_msg_baton = this;
++      ctx->notify_func = onNotify;
++      ctx->notify_baton = this;
++      ctx->cancel_func = onCancel;
++      ctx->cancel_baton = this;
+ 
+ #if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 2)
+-      ctx.notify_func2 = onNotify2;
+-      ctx.notify_baton2 = this;
++      ctx->notify_func2 = onNotify2;
++      ctx->notify_baton2 = this;
+ #endif
+     }
+ 
+@@ -234,7 +234,7 @@ public:
+       if (!value)
+         param = (void *)"1";
+ 
+-      svn_auth_set_parameter(ctx.auth_baton,
++      svn_auth_set_parameter(ctx->auth_baton,
+                              SVN_AUTH_PARAM_NO_AUTH_CACHE,
+                              param);
+     }
+@@ -245,7 +245,7 @@ public:
+       username = usr;
+       password = pwd;
+ 
+-      svn_auth_baton_t * ab = ctx.auth_baton;
++      svn_auth_baton_t * ab = ctx->auth_baton;
+       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME,
+                              username.c_str());
+       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD,
+@@ -654,13 +654,13 @@ public:
+ 
+   Context::operator svn_client_ctx_t * ()
+   {
+-    return &(m->ctx);
++    return m->ctx;
+   }
+ 
+   svn_client_ctx_t *
+   Context::ctx()
+   {
+-    return &(m->ctx);
++    return m->ctx;
+   }
+ 
+   void
diff --git a/dev-util/kdevplatform/kdevplatform-1.2.81.ebuild b/dev-util/kdevplatform/kdevplatform-1.2.81.ebuild
new file mode 100644
index 00000000000..571066fa6d1
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-1.2.81.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdevelop"
+KDE_SCM="git"
+EGIT_REPONAME="${PN}"
+KDE_MINIMAL="4.7"
+VIRTUALX_REQUIRED=test
+KDE_LINGUAS="ca ca@valencia da de en_GB es et fr it nb nds nl pt pt_BR ru sl sv th uk zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE development support libraries and apps"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# Moved to playground for now
+# bazaar kompare mercurial
+LICENSE="GPL-2 LGPL-2"
+IUSE="cvs debug git reviewboard subversion"
+SLOT=0
+
+# Moved to playground for now
+# bazaar? ( dev-vcs/bzr )
+# kompare? ( $(add_kdebase_dep kompare) )
+# mercurial? ( dev-vcs/mercurial )
+# block - some plugins moved to kdevplatform from kdevelop
+DEPEND="
+	dev-libs/boost
+	reviewboard? ( dev-libs/qjson )
+	subversion? ( dev-vcs/subversion )
+"
+RDEPEND="${DEPEND}
+	!<dev-util/kdevelop-${KDEVELOP_VERSION}
+	$(add_kdebase_dep konsole)
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+"
+
+# Quite few fails and upstream is aware
+RESTRICT="test"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# FindKDevPlatform.cmake is installed by kdelibs
+	sed -i \
+		-e '/cmakeFiles/s/^/#DONOTINSTALL/' \
+		cmake/modules/CMakeLists.txt || die
+}
+
+# Moved to playground for now
+# $(cmake-utils_use_build bazaar)
+# $(cmake-utils_use_with kompare)
+# $(cmake-utils_use_build mercurial)
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build cvs)
+		$(cmake-utils_use_build git)
+		$(cmake-utils_use_with reviewboard QJSON)
+		$(cmake-utils_use_build subversion)
+		$(cmake-utils_use_with subversion SubversionLibrary)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 6f52facae54..a256af5d3e1 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -32,12 +32,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
-	!dev-util/kdevelop-git
 	$(add_kdebase_dep konsole)
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 "
-
+#!dev-util/kdevelop-git
 # Quite few fails and upstream is aware
 RESTRICT="test"