Fix test CTest.UpdateSVN with subversion-1.7, bug 390533

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

4 files changed, 53 insertions, 17 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 154d29b6c3ba..dc22fb6c5f48 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.177 2011/11/22 22:18:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.178 2011/11/23 20:39:10 dilfridge Exp $
+
+  23 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> cmake-2.8.6-r4.ebuild,
+  +files/cmake-2.8.6-testsvn17.patch:
+  Fix test CTest.UpdateSVN with subversion-1.7, bug 390533
 
   22 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -files/cmake-2.8.5-FindBLAS.patch, -files/cmake-2.8.5-FindLAPACK.patch,
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 8cae898010c1..e36adaead317 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -17,27 +17,28 @@ AUX cmake-2.8.4-FindQt4.patch 10926 RMD160 15da9e13df5a98f9171a263c0c9d23f45707b
 AUX cmake-2.8.6-CodeBlocks.patch 1171 RMD160 ca898b0b0664f74dde77bfea742463436753e6da SHA1 083c105f5af4e215d109ddf4f90c91b454c85dfc SHA256 b274e3d9c82f5f7ffb21c44234a3b42bb671b9b8ad3314b09baa329c18447458
 AUX cmake-2.8.6-FindBLAS-2.patch 1119 RMD160 e7b3976c2ef7c0358e9b1b90e567e4ef1d48bc64 SHA1 cab554930d495ca7baedd125ec637c36f511bcb0 SHA256 295999abe12fd8103bfccc22606ff2c730831f495c44d52d80dfe8952815874f
 AUX cmake-2.8.6-FindLAPACK-2.patch 1158 RMD160 2fb17c71e08e930ed9a71f59a4316c35749159b2 SHA1 6e4b552ea1d9a6a464089935a50ed1152b2323d1 SHA256 2caacc85c393d9ad09f2c92d0595480d1e02b8db6285aa35f270858075465425
+AUX cmake-2.8.6-testsvn17.patch 1033 RMD160 2fa56bf0177607c88c2e2960b2839b2df8820f2e SHA1 20b1003e391c44d8854105efa8592ac9b7ab6f2c SHA256 6d90df7a5472eeb8be81a70ee4a5f5850bb9d469ef9390af930ba7d6d528183b
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.8.4.tar.gz 5477628 RMD160 8b92eb11391b07433e7fe02bbb80c3ebcaaf1893 SHA1 6c42699bd63fdfcc7743d4906e3208d051d7f19b SHA256 d97ea9f807f5407030d4f7246accc26addc520c9ee3897c4582eba3da49253cc
 DIST cmake-2.8.6.tar.gz 5583905 RMD160 c3095a4776367496f895b8075fda373568f01878 SHA1 7c2cbd42d27e26580cd4923892197b84b2a90675 SHA256 e6999b81ac367d85ffb0f69b6c4a0ef96f95dc154efd3592f9cfebacdf75728e
 EBUILD cmake-2.8.4-r1.ebuild 4510 RMD160 64efe5aa8c2b68908940ccf922d4754fc1a40d09 SHA1 0ef8f21873968242807661aa4ebb5617bb8e063b SHA256 b4aa824de85f7e74e6ec2c062d1ded1261fad04f3de7fbd0295faf32a6ebda5a
-EBUILD cmake-2.8.6-r4.ebuild 4884 RMD160 3b984ce337aba61b85b591c8b5ac4efcfb7a0454 SHA1 0a9176a405d66b873b445ae0c1031df56d37bf7c SHA256 2323def80c90f01db10a3462637dbb15ff95f1c73a2e8136a33fe3d6fd6fb0d3
-MISC ChangeLog 28538 RMD160 ebc253c864ef0c560b4dd8c935921b10b1949277 SHA1 b0fd489403ff3ff40be5506913d9eeec9abd101b SHA256 e65bbf6541b77609798239d8d411204d9c13dd01425841c401835c3480aadf00
+EBUILD cmake-2.8.6-r4.ebuild 4927 RMD160 019959d38b01002df85885e7525815a49829e86f SHA1 e155d75bf7a94d085d3c6653a8caa01b5be64b52 SHA256 ebd0da1aa31d84291a173a49198fcdc8164d309889ed7326e275e74cc62cec0c
+MISC ChangeLog 28716 RMD160 1ee65d824d8b9bfb3cc1d829ffc22011be3ce8ea SHA1 b5de81aaee7b5de37d6661492edf3de7efefad3f SHA256 f0fdcdc70b893fd6dad2d72aa06dd53b2700c163b83ac93090542e4f8d82fbc2
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOzB+yAAoJENwGBM22xffeLYMP/RTiGymW3PFae1RVf3dHOTCW
-LniLCop4q/Iwr99Ueb2Uj/KbK/L5ohaTm5mlaNdUqHKddy4b/LykSpbQJfPO7btu
-XoEP5fkkOf/jyZ5lgFHuZm/C0lXzCQUg1aXcfkdB3POmAfZMqBEaEk+qVQxokFwI
-APAaltWoyXvxXMWVMrX8ysVcnpEc98iXEVQ5+5rz8/xYwvMqHoGkEnF+XAeakocl
-IMo/T7YkkMu1lwfdAvK7Ck0/NjxCk/UmBHMifaouivsx7Va8mF/foYwK5/1QEOiK
-f2Q+j8wMTrHRLKWJ5SbJHxO9+r9ZFqeYthm1CqC/Y/SjV+VJ77tSs/DAL92/iQhX
-bGBkIJos7jsY+o9fohV/yMLJa9Mb3bB0TMOtmY06/6a0CAy4Y2QVzHOGT7FTrKB2
-hF/jM90/xV2BWeHyyymFxuYp4XvzkWxSb6XldRjcYIKrCdCUERxeK/t+/uVpOQOl
-rcXXmPLKnrqOP4cLWR7LrYdsaEep745iOBSizNp2rR1A4YSHfh+EXwOE3KIL6KZb
-qAtINVvEKw/ExpLyMSCBTVx+61FeGy4QQFG8mSPdwr1ztpFK93E4kZYsd920YcFx
-m7PrAO8IU6Y7mPvoQ4AFcKEEJXp++m97e28nZPMGdtYEc/XTHS0xjm8lspoKnqu6
-pQ3iY9+oCj+N90t6E2Ss
-=t0VM
+iQIcBAEBCgAGBQJOzVn5AAoJENwGBM22xffe2twP/3qbz9fNKYbcqgOujwZMgEJQ
+RvKHn4VyS85JA8OCuJtdLhK4PY7wzS3MOpZWCdf2OJXLT/UPUkajJ7PqwvDEAHff
+lNO8yFZpu3IsFs+koPbq1rKVBo0X0BfmPqjZNIh2DInjYLFDo0zP3kEHjE3+qe48
+n7j869ohgMKDcC/nxgMhNaZarnXUIzZNbFkVOTST3yK10T0Blf9Uumk3utbt3XAD
+sWskrOoU09Mv6FFIuw5i24JVzCbEfd3xFka3LKWWfv2z07vqUeeZfgDqYi9+cN6r
+lnbQYARpCSJbtbvh6Nymk1mJwX9KITN+Zs8jHNGeSzGlsWwV06jfBcVp0ICm8ntf
+cWsvfXcJzDDlTHr2zF9lc9JsS3pGY8np1XDbeckYC5KQ7DQwgoONgaMqXsfAUbZd
+ZXE88rkT991PPgSyApU6htL5Mn+nEIsG5smy1zq1loe+R56btAm38jUuJOrikuq2
+wCqVktGym+CHhUBHyoigfGXjzQCqRYCBxnNjl18ygHLmohFbX5qaSriz5pU9vaoT
+4qkUC3+rq9RaoPfDRUoy6z1hV+f7RF4zjak4Pa9G/+Tr575m3FU2oXObjeg9+FJo
+1Ctnr5035CgzM/nbI7DjnK2BPCXwtibc/odiNCXoicMPf2Kn9wNIg+upr0KzKxph
+y19IblTg8sq2tKC/ivKs
+=NZxF
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.6-r4.ebuild b/dev-util/cmake/cmake-2.8.6-r4.ebuild
index f18e4d5ab1e5..e1db0b037907 100644
--- a/dev-util/cmake/cmake-2.8.6-r4.ebuild
+++ b/dev-util/cmake/cmake-2.8.6-r4.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/cmake/cmake-2.8.6-r4.ebuild,v 1.1 2011/11/22 22:15:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,v 1.2 2011/11/23 20:39:10 dilfridge Exp $
 
 EAPI=4
 
@@ -59,6 +59,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch
 	"${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch
 	"${FILESDIR}"/${PN}-2.8.6-CodeBlocks.patch
+	"${FILESDIR}"/${PN}-2.8.6-testsvn17.patch
 )
 cmake_src_bootstrap() {
 	# Cleanup args to extract only JOBS.
diff --git a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch b/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch
new file mode 100644
index 000000000000..77467676c841
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch
@@ -0,0 +1,30 @@
+diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in
+index 97b2a07..edafb4ef 100644
+--- a/Tests/CTestUpdateSVN.cmake.in
++++ b/Tests/CTestUpdateSVN.cmake.in
+@@ -23,6 +23,16 @@ file(MAKE_DIRECTORY ${TOP}/config)
+ set(SVNCMD ${SVN} --config-dir ${TOP}/config)
+ set(SVNUSER --username "test author" --non-interactive)
+ 
++# Configure for this svn version.
++execute_process(
++  COMMAND ${SVN} help add OUTPUT_VARIABLE help_add ERROR_VARIABLE help_add
++  )
++if("${help_add}" MATCHES "--depth")
++  set(depth_empty "--depth=empty")
++else()
++  set(depth_empty "")
++endif()
++
+ #-----------------------------------------------------------------------------
+ # Initialize the testing directory.
+ message("Creating test directory...")
+@@ -63,7 +73,7 @@ update_content(user-source files_added files_removed dirs_added)
+ if(dirs_added)
+   run_child(
+     WORKING_DIRECTORY ${TOP}/user-source
+-    COMMAND ${SVNCMD} add ${dirs_added}
++    COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added}
+     )
+ endif(dirs_added)
+ run_child(