Fix crash with subversion-1.7, bug 388029

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

8 files changed, 247 insertions, 28 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 2983902515e8..4afd04d94c7c 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -3,24 +3,24 @@ Hash: SHA512
 
 DIST kdevelop-4.2.2.tar.bz2 4984161 RMD160 cb6d09e05d182d32f90fe92768a8839e2ca69838 SHA1 943f86edd0f353bfa4c614972af222a1c7075755 SHA256 e713567fc1b4faa3f7a1077d9b48005c41f623bdab78c831e3f7efc5a90268e7
 DIST kdevelop-4.2.3.tar.bz2 4991238 RMD160 9e403f9457ff33adf0afdf107eb0255a560c9014 SHA1 e87ae29b343df3fea9bda7d8d85ec696e57b68e4 SHA256 cab3863f7dc009949c4b9a2e881141064e83d2faced3d475db571052b468c32b
-EBUILD kdevelop-4.2.2.ebuild 1721 RMD160 45ac007ce528a964bbf53e112266b874fbebc47f SHA1 68115065929830c26a297857d0de7a2d31262ca5 SHA256 f4b7168197d217a4172515017891edb9a580353ab234b744d9840ffe0aedcd7a
-EBUILD kdevelop-4.2.3.ebuild 1534 RMD160 29080b550df1858dba6e3ded099fe9772a13da39 SHA1 a0e8fa1373e3ad4f3243327ec7a43974f71f2cab SHA256 7687a633dfaa9189648d046d89ef4b13a58c55c9176ad074a62d24622979f359
-MISC ChangeLog 33407 RMD160 e08b07711e9d0acbc1ddca1b5822d02fdc878281 SHA1 5221f59a0ba84e3eec057fb4de21a8ba515ea2de SHA256 db2fc9b7ae625f6841e18f5fc5b96b735068d9f2eefe6d431b4a5679c62a4895
+EBUILD kdevelop-4.2.2.ebuild 1692 RMD160 cfe6cefda7cd0f4533115e426634c539e164ef52 SHA1 bfed9f547fb7fc6c89bb1f548f896e2c5067d6f6 SHA256 eed2c516e46140529c1449f3a43005d1d07e77045daef951e6d7c81ec05828ce
+EBUILD kdevelop-4.2.3.ebuild 1505 RMD160 c1997ac029ad70c9a6cd104c442ef8794ce3f354 SHA1 e5a4fe551ec4edbad7c4317d57ae0ba7753f25ca SHA256 03d39d37e599fc6663f5d6f3ed8f606628230ef7df01b36ffb547c78da37f6aa
+MISC ChangeLog 33601 RMD160 6b57349da6ba63a266c49dafc86a29a45bec4a80 SHA1 2b0290f72aa2cf220f91c1802c3fda05ecab0d26 SHA256 1f906ae1a3dda9f568fbe096fff5f500431f70a81b495feb7c1305875f41cc2e
 MISC metadata.xml 429 RMD160 19300c79fd5f01e46ccdb57c48e9092f84a99df4 SHA1 c0fa5ba9271542c990a65094391985285fdc17af SHA256 57c402369aa48da3ae4102f7d649da1e3c0bc1ddb38672ae51759cd8490b29f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOreQ7AAoJENwGBM22xffe86kP/iPU0RrQiNjo0Og+8UBdCcUj
-xh4MZxbvMAnNwG7I02UNUYBaY9gqxxMvXTz4f4W7BoigSDj0gE0zCZjZGSsK2X2W
-XuC2cNR0z3DU0UxkHAXR+lEvpXViIIHtMFtXsYc5k7AdaKXTR4tMYTMkBlcKefTx
-YD4m77BzOMa3QUqd5S4ZgLFdZ1X6Texi5BkxuXKrIF/7JmzGrLbWQMPleIH7D5yj
-ynuyNZ0L5rm7Kdh+PEJyU7qhsvDBB6yqocz/ys6/TsWBGe/gxuNgaNyMgtePsdSM
-lVRlY6kUrBsXx7PPSQjdfVvmaLBjgYy8eNPGhoBDJtIaBt61iiIGQhnUaVM831NH
-FNy9ViCI9VLw68y0jDHkIJNxIbCpiiJTr3RcBHO4YTc7slZwKb4eSNDQW3liCXsm
-iY47UZ3b42gcAarxPE1ROSsCkjzTQ2ABpuJHxV5o9+NBke3ptPDC3P9sI6kEeq95
-iNaHAb4DrPFW2Yd3UL8UM+KqrzlvVnJ/KpAYRsgAhurl9sCl+6y6yl61Oe+UfTwF
-r6/HBNQvImHAmY8sSfZN1yzJN2zXFiNwuJ188wkgUeXSK5eS1djFm9xDsQOMY9Zl
-9aWuEHhQmjv5iLlA2RtlSRKHr1AOIqQ6ThldbXjaiyv9hW8KMquXJuXcf4g0DWvf
-wZFWZZrlUWpL95vgu+9O
-=6Bbq
+iQIcBAEBCgAGBQJOyYBHAAoJENwGBM22xffe20oP/RGkLqB+OBbD07QNi+MiQqP5
+7xL7U2FO7eiWQh5kLYfM8GnVUP8T2HvBQN2kBsctzjpzvRVzho9Z57y1cnQ369y3
+702fmthzxvaDCQO+UVXodLyGo2dJSXJQYCJl0ZgmU/0T6XSuLsQ83dzmYpoy5Ap7
+IN9lP+SxEdh+uaCyOgvzbPj/gnHWzQLwYpi1GuhVMiepumTkj1Mau+8e49gCcf0u
+VIkhnXpwWBILn1XAA+tmGYlP4sGyjRMSV8JaIw6oJO+12cNA5URqgxVGbKGENach
+cifyr0+Ejywzf5DLSXjevqQQ6/dGq/oozouLVpzq7mDfMzMw9us5B0cwJ0KfFGi1
+ltNit8rImkgPdKN9SKYR1LMrPLTv8Cv/2Da0m43WB9KsO1sfPLvA3QGS9Zm7NJb/
+ZkrhoCCl969Dmgiq1ry9mbMzYm624xBafjf/uDHquv+BerjH/H7xxhdXxxJARc9k
+/+k1Ss37+8lMNet6ZUyw3YdMZvqLHu+aSV+PU3CjhgraU2Jj0dzAEsB5zf3HMdHj
+H1wPe5s3xk78OAhSbUqf4vKIKC7rP06oaD58HJdqdHmAJmxsSj+Gh1jCIIGJsMGH
+1d5spW3xMN57NoFv473yqBTtCKzDSLqidlXzCYpEpi0wVx/nTNFxoHJkokvMuWkU
+gKbOXPnFpx/sv7YxXyrh
+=e8Mm
 -----END PGP SIGNATURE-----
diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog
index af2a903f80bc..6c8481d11b37 100644
--- a/dev-util/kdevplatform/ChangeLog
+++ b/dev-util/kdevplatform/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/kdevplatform
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.59 2011/06/30 00:26:30 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.60 2011/11/20 22:32:26 dilfridge Exp $
+
+*kdevplatform-1.2.3-r1 (20 Nov 2011)
+
+  20 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdevplatform-1.2.2.ebuild, kdevplatform-1.2.3.ebuild,
+  +kdevplatform-1.2.3-r1.ebuild, +files/kdevplatform-1.2.3-svn17-1.patch,
+  +files/kdevplatform-1.2.3-svn17-2.patch:
+  Fix crash with subversion-1.7, bug 388029
 
 *kdevplatform-1.2.3 (29 Jun 2011)
 
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index a9bea3da242f..11cbbea68e54 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,16 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX kdevplatform-1.2.3-svn17-1.patch 880 RMD160 c373d65a730f3f22d4ecbe0c4d8361e51319eb33 SHA1 9d0faf67a17ebbe6d6435dea41301925685b71cf SHA256 498c8dfbd23fb27c09bd4de3a41ba483b8b8eeb3904d9ffc6d5cab52b47ded72
+AUX kdevplatform-1.2.3-svn17-2.patch 2845 RMD160 f1ece5a97c63c04654a822c4eaf2abbc9953d0f2 SHA1 6347a7e27b2dbe13a1bd18632a7068429420940c SHA256 14700589af7c160ea098c14b9104b4ffc524684069384a40a60127338745bfe0
 DIST kdevplatform-1.2.2.tar.bz2 1750530 RMD160 16f66c3e4d77611c627f9b50a0c01ec767f4be05 SHA1 7b3c0d3e3e66fe1c959b3343e7283e4212014e92 SHA256 84b58896f76882d42196ba2700287b0b627724ac756d9999e08a86733acbae26
 DIST kdevplatform-1.2.3.tar.bz2 1751819 RMD160 04d8b57c53f384bb86cf5a3abc214d37e5b3cf8b SHA1 c8badd157c2477b1b299403d01d40f68a1ba14cd SHA256 0868b13a4de79ecf981409d34f13a108ef6379abdf7be21e4e0dad390fa4a5c0
-EBUILD kdevplatform-1.2.2.ebuild 1755 RMD160 f68e8bceb131a3278e6e956aaf6ed5a756e602e0 SHA1 11546adebfd282b40cc42e5848cb03ffbdcbcd78 SHA256 53b65982fcd76b6530516d7c0ead281a5a87ad3af4df755a928b5687d50895b6
-EBUILD kdevplatform-1.2.3.ebuild 1762 RMD160 a45270469ba49e2787aa820cb804e279c7c363be SHA1 80e260c247991e85b097b7571f331070ad605826 SHA256 b08c948e7ce3493cf5bdaa37e55733f162e97a30c026ccb74ed9172c9d95a4a2
-MISC ChangeLog 8620 RMD160 92d5e80a1334e85919c9189c42fea01e2e2b459f SHA1 913a7e3f868b729c5c37f0355a60c24c5b00b20a SHA256 03f109ba810b4b7e82bbdfa234d0c9bd78ccd513448185aeeec271f5daee2f85
+EBUILD kdevplatform-1.2.2.ebuild 1759 RMD160 0445d374ba4e033ebdb13594a99747427d65e3b3 SHA1 9445154edbf32be0fd7b4fe5c6e5732bd5ba28d8 SHA256 60e5c84ee0623070bb5bbf94d49e6ce76477c6c0e827502736a6df2ec04c2424
+EBUILD kdevplatform-1.2.3-r1.ebuild 1810 RMD160 27d3313668be27faaa65cdf448026dabfb14c8b7 SHA1 04ec64da103e40afc68c34c4281a4379060602df SHA256 e78ec4bf7047e9ce8d41196fe7c6a0fe242576739327aa3d1790b2ab8f4a82e8
+EBUILD kdevplatform-1.2.3.ebuild 1762 RMD160 9574bac1e9f86d55a0ab172e254feb9b6173b568 SHA1 5fa1c06706974265ae9eccd0ff6016fe4c89b141 SHA256 c7e5f53eee14a3e24f42cefee781d505f3f6eff3111a1fda5615c33c4115a289
+MISC ChangeLog 8934 RMD160 4f3ca500cdabc4989a11b5ab189240499c079dcd SHA1 8391e2f1d1cff695b45ff460a851d136de09c625 SHA256 f557ef5eea2f41de5bd09bb3f3bb2b0a339f40dbcf299010f12c39fd714ac5f9
 MISC metadata.xml 289 RMD160 5df6ca559e1302043ad23456aedb09fcacd7acd7 SHA1 9f26aa927ee5c2209fcb3684bf00023c5aa4dada SHA256 88e0f5b61bd48a62ee51897ec303a9098be25268904c2d63185531ee1a412b3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4LwpgACgkQFuHa/bHpVdufcwCbBi4AOPYVB36wTXdRqBCquRrq
-qj4AoMHAk9mtUEm3npHRCOhorzFm6zJI
-=jndC
+iQIcBAEBCgAGBQJOyYAAAAoJENwGBM22xffeo9sQAJYq7XHL+krM8pZlw3r1Vo94
+lBJaoYrFRKEbL+/PgQEQK8fCm4Bp1KXZxvsn8MlBYbPTiNTMeLYpwPvBL4meU4+l
+gvALOdbLq9pS/4D31bTlNBpeU6zd74YHgJ7nAXoEheqQzdTJ1YGw9M+Lba3uQxzW
+PWYBNRim7lgMeRKwcSXNjHDOgLs02ckOH8ahVLjIWvwgwZsmK+MefIKtW37WBENT
+7vvln1JCDbp5bZ0oeU94Qs7QTEr8YvZ5swl1cjgy99b4wpIKgUw/em7ixAv1DGsp
+1AMHB47lYDmub+ixs2yeuSh2EDzbeJhi981VOlS3gQS7RZnRJf8rB1LlVLSBreLn
+/oju/TPTUuJ3EcvWEtLovlz5I+HJltyKCInyoa1rtToux8cDgQ6w8R/JKJcG5+2J
+NRYDk2J0M87osDRY2YIJ5CH92796kmUmUYQIjR5C7xy4sJ+wnX2XGefcT2RzUpyQ
+4IfjA+XkMUWFBh3axBZeRFJZLUfcUkKdNnLwZ5EkbtCu9KWrlAGF69/jyvKZDQDY
+SKewTBqP/XEe1DWKQo72MdIWxUXZYvMZZ9hYldImAi+U6DLmOW7ZsKvST/dQMXMS
+tODvtGDfCbgipfGazqsbDWWcV4VBsRrbMH2WWDIPdsDkPnSiRrwErL2K2Vyv2mSO
+6B0adKp4tC7pqKioWIwe
+=hR5Q
 -----END PGP SIGNATURE-----
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 000000000000..c1ca7582e194
--- /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 000000000000..a240eedc4380
--- /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.2.ebuild b/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild
index 1db6370e6af3..64d3fde10746 100644
--- a/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild,v 1.6 2011/06/07 02:58:47 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild,v 1.7 2011/11/20 22:32:26 dilfridge Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ IUSE="cvs debug git reviewboard subversion"
 DEPEND="
 	dev-libs/boost
 	reviewboard? ( dev-libs/qjson )
-	subversion? ( >=dev-vcs/subversion-1.3 )
+	subversion? ( <dev-vcs/subversion-1.7 )
 "
 RDEPEND="${DEPEND}
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
diff --git a/dev-util/kdevplatform/kdevplatform-1.2.3-r1.ebuild b/dev-util/kdevplatform/kdevplatform-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..eaa009ac7ab4
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-1.2.3-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3-r1.ebuild,v 1.1 2011/11/20 22:32:27 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdevelop"
+KDE_SCM="git"
+EGIT_REPONAME="${PN}"
+KDE_MINIMAL="4.6"
+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"
+
+# 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}:4
+	!dev-util/kdevelop-git
+	$(add_kdebase_dep konsole)
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+"
+
+# Quite few fails and upstream is aware
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-svn17-[12].patch
+)
+
+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-1.2.3.ebuild b/dev-util/kdevplatform/kdevplatform-1.2.3.ebuild
index 274d83ca9f3f..d43aa76f6cb0 100644
--- a/dev-util/kdevplatform/kdevplatform-1.2.3.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3.ebuild,v 1.1 2011/06/30 00:26:30 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3.ebuild,v 1.2 2011/11/20 22:32:27 dilfridge Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ IUSE="cvs debug git reviewboard subversion"
 DEPEND="
 	dev-libs/boost
 	reviewboard? ( dev-libs/qjson )
-	subversion? ( >=dev-vcs/subversion-1.3 )
+	subversion? ( <dev-vcs/subversion-1.7 )
 "
 RDEPEND="${DEPEND}
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4