[gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/

["Chris Reffett" <geekboy72@gmail.com>]

commit:     a9d026ede38de3254565a5fa62c09b14746571e3
Author:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
AuthorDate: Tue May  1 22:16:25 2012 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Tue May  1 22:16:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a9d026ed

[dev-util/cmake] Added patch to remove failing tests, removed RESTRICT

---
 dev-util/cmake/cmake-2.8.8.ebuild            |    4 +-
 dev-util/cmake/files/cmake-2.8.8-tests.patch |   58 ++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild
index 11db0c4..1386340 100644
--- a/dev-util/cmake/cmake-2.8.8.ebuild
+++ b/dev-util/cmake/cmake-2.8.8.ebuild
@@ -18,9 +18,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 SLOT="0"
 IUSE="emacs ncurses qt4 vim-syntax"
 
-#Test 62 wiped out /usr/local/, restricting until that's fixed
-RESTRICT="test"
-
 DEPEND="
 	>=app-arch/libarchive-2.8.0
 	>=net-misc/curl-7.20.0-r1[ssl]
@@ -62,6 +59,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
 	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
 	"${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.8-tests.patch
 )
 cmake_src_bootstrap() {
 	# Cleanup args to extract only JOBS.

diff --git a/dev-util/cmake/files/cmake-2.8.8-tests.patch b/dev-util/cmake/files/cmake-2.8.8-tests.patch
new file mode 100644
index 0000000..64af9d3
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.8-tests.patch
@@ -0,0 +1,58 @@
+Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root
+--- cmake-2.8.8/Tests/CMakeLists.txt
++++ cmake-2.8.8/Tests/CMakeLists.txt
+@@ -273,23 +273,6 @@
+       )
+     LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
+ 
+-    # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
+-    # this test also depends on the existence of the standard qtiff plugin
+-    if(QT4_WORKS AND QT_QTSQL_FOUND)
+-      ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
+-        --build-and-test
+-        "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
+-        "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
+-        --build-generator ${CMAKE_TEST_GENERATOR}
+-        --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+-        --build-project Qt4Deploy
+-        --build-options
+-        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+-        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+-        )
+-      LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
+-    endif()
+-
+   endif()
+   endif()
+ 
+@@ -1548,30 +1531,6 @@
+       LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
+     ENDIF(Subversion_FOUND)
+ 
+-    # Test CTest Update with CVS
+-    IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+-      FIND_PACKAGE(CVS QUIET)
+-    ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+-      FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs)
+-      SET(CVS_FOUND ${CVS_EXECUTABLE})
+-    ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+-    SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
+-    IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+-      IF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+-        MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
+-        SET(CTEST_TEST_UPDATE_CVS 0)
+-      ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+-    ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+-    IF(CTEST_TEST_UPDATE_CVS)
+-      SET(CTestUpdateCVS_DIR "CTest UpdateCVS")
+-      CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
+-        "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
+-      ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
+-        -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
+-        )
+-      LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
+-    ENDIF(CTEST_TEST_UPDATE_CVS)
+-
+     # Test CTest Update with BZR
+     FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
+     MARK_AS_ADVANCED(BZR_EXECUTABLE)