Revision bump to fix bug #358317.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 259 insertions, 25 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 2469641c935e..3a2c288a9b45 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,12 @@
 # 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.163 2011/04/07 18:15:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.164 2011/04/18 10:17:30 scarabeus Exp $
+
+*cmake-2.8.4-r1 (18 Apr 2011)
+
+  18 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -cmake-2.8.3-r1.ebuild,
+  +cmake-2.8.4-r1.ebuild, +files/cmake-2.8.4-FindQt4.patch:
+  Revision bump to fix bug #358317.
 
   07 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.4.ebuild:
   Inherit virtualx.eclass to fix bug #362389
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 47574ca325a3..1e8eeae1b38f 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -23,22 +23,22 @@ AUX cmake-2.8.3-ruby_libname.patch 558 RMD160 b701ba52d7e13e69f25914ab661dcf9e7c
 AUX cmake-2.8.4-FindBoost.patch 635 RMD160 4a665b76e4cf10ee67d5370527867882f9a39127 SHA1 9a2491484d8818584411bf08b37cf6580027a7f4 SHA256 3c4d42b772b85e6838eaaecdb71ea345630fe519102d7c2f2234bcf8b9c63154
 AUX cmake-2.8.4-FindPythonInterp.patch 543 RMD160 e71546dafa162726bce3f46994833a0d48ce9345 SHA1 cf61a9a45e5b6aece87453ff2c240f38ee0c8e0c SHA256 816a0c324abbb98ee342901715f7b07b31c2cdbede247a22178e13e5488264fc
 AUX cmake-2.8.4-FindPythonLibs.patch 642 RMD160 b116a8f6d4dfd722943a88b1998bfd194a014853 SHA1 f599c1e88a5a64a215e7d27cbfd097543b42e389 SHA256 5c9be7cad3446dc07ad75cc221a2de7df073fb35670ed5325516ef7db4b0c7a3
+AUX cmake-2.8.4-FindQt4.patch 10926 RMD160 15da9e13df5a98f9171a263c0c9d23f45707b494 SHA1 a7f1c589b115f6e5f9abfeb589cb07095510b1f4 SHA256 0aaa6b6a8fa4fdf3aea8efeaa831a3443e60a5a453cd7b71207e57980bce5564
 AUX cmake-FindJNI.patch 2020 RMD160 4fcb9714de65eb146a2696cd6613357684515b2d SHA1 c463daa6e7d3a1d7065607f97993b5da3486e7e1 SHA256 c5390550c192aea18415087ed891f7e5192b2a385c9c72f4cda0c19b13f6bfbb
 AUX cmake-FindPythonInterp.patch 498 RMD160 a4113724d0c2bdb53e7c947790d8a7e337759c84 SHA1 abd7754549fef5aae515361acd6a509c98227bf5 SHA256 8c3d4dc1898eae4adaa392b556286076594470277bc7c1bddbe2a28213fff7c0
 AUX cmake-FindPythonLibs.patch 546 RMD160 429021001f1b464d8321703052890a34141a34ec SHA1 e5d62feab16058f123e1399e0504a50f50ee5a88 SHA256 86a5e78ff4e62cf8987401255197f7ba4ae70d00c257df3048372c5dcc035bdd
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.8.1.tar.gz 3605611 RMD160 38b0876597def32a535d5305fb8f706ff29beabe SHA1 fb93c8766a3bd71f2a824291717700c118d29be5 SHA256 4b65b819c00874c34196640411f6f9e877abf23733ba0ef68f73b4fafd3b3022
-DIST cmake-2.8.3.tar.gz 5436543 RMD160 8bcba88ad884e22bbadf4c594a5f3b0bdbf2e12c SHA1 e9bfbec47b3939be6f83ffa8006884285c687dc2 SHA256 689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288
 DIST cmake-2.8.4.tar.gz 5477628 RMD160 8b92eb11391b07433e7fe02bbb80c3ebcaaf1893 SHA1 6c42699bd63fdfcc7743d4906e3208d051d7f19b SHA256 d97ea9f807f5407030d4f7246accc26addc520c9ee3897c4582eba3da49253cc
 EBUILD cmake-2.8.1-r2.ebuild 4383 RMD160 4bddb8e75bc3bfdace40bffc937d57b5e1fcdcd1 SHA1 43d5a4e45080899eb4dee38018097fa7add682a6 SHA256 acde4f84795ce01035c7cff3a3bbc739ab52eb568c5b252fd6d3dda912d53fc1
-EBUILD cmake-2.8.3-r1.ebuild 4304 RMD160 efc2edbc07f3d764857fd8d86d43b5655c7c49d3 SHA1 fbc007112e65b9d42a58c037ec0e7c1c3602e5ee SHA256 8116923b9ad799774443eac9c9f104192c29cbc06424e30d0a51b2cd8c007bd8
+EBUILD cmake-2.8.4-r1.ebuild 4495 RMD160 cd02e5f0a3fa1cc8a8335ba3598329275b2c4816 SHA1 f002b7d9a6e965d827f07db5b2afc06186009202 SHA256 c20487823b6ebac3c68b8586c8efe6936a611feb13e54084b964160430b8a51d
 EBUILD cmake-2.8.4.ebuild 4478 RMD160 20a40ec00450215c4577099f7dcd3824119f0e05 SHA1 b564af1ad3b144fbf2f808cc9001162f8f17f1c1 SHA256 b26eb274432fbf76f8c7348c5d96d45945ead8f994d14ab688fb89a536dc76b0
-MISC ChangeLog 25132 RMD160 3a77a78d860796c314284de96d4d8876bd9eb7dc SHA1 1a2204b558a8de011477a46660ebd4f890c2376c SHA256 23bfeec2b7820c329e917d85bc4ba13d43caf82b6fecff073bf461b34c8c07d5
+MISC ChangeLog 25339 RMD160 f7b3ebedbd9bd97f5b3fbf2e70834a061c3427b4 SHA1 1791c530290cdb91fd8053265c0f14a942d4cf8d SHA256 fa8771f6a9232554228acaf90c0408da201845c34c5552c124760ca1461852fd
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2d/zIACgkQHB6c3gNBRYfzNACfa0T58AuP66a5OTpfh230JSAF
-nbUAnRpvE+Grgib4FV9th2on5JtStdIW
-=jq6g
+iEYEARECAAYFAk2sD7kACgkQHB6c3gNBRYf0OwCfaIpAheiCbtwto71gYrRwt1+q
+v0UAoJcQKqBUsVnzK77tT54Ju6r+bPtY
+=f5zg
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.3-r1.ebuild b/dev-util/cmake/cmake-2.8.4-r1.ebuild
index e5abc6ed4d66..a978c612459d 100644
--- a/dev-util/cmake/cmake-2.8.3-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.4-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.3-r1.ebuild,v 1.4 2011/01/17 23:29:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.4-r1.ebuild,v 1.1 2011/04/18 10:17:30 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
 
 MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
 
@@ -42,21 +42,21 @@ S="${WORKDIR}/${MY_P}"
 
 CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
 
+# REDO ME:
+# darwin-no-qt
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
 	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
 	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
 	"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
-	"${FILESDIR}"/${PN}-2.8.0-darwin-no-app-with-qt.patch
-	"${FILESDIR}"/${PN}-2.8.1-FindBoost.patch
 	"${FILESDIR}"/${PN}-2.8.1-libform.patch
-	"${FILESDIR}"/${PN}-2.8.3-FindLibArchive.patch
-	"${FILESDIR}"/${PN}-2.8.3-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-2.8.3-FindPythonInterp.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindPythonInterp.patch
 	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
 	"${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
-	"${FILESDIR}"/${PN}-2.8.3-buffer_overflow.patch
 	"${FILESDIR}"/${PN}-2.8.3-fix_assembler_test.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindQt4.patch
 )
 _src_bootstrap() {
 	  echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
@@ -112,34 +112,43 @@ src_configure() {
 
 src_compile() {
 	cmake-utils_src_compile
-	if use emacs; then
-		elisp-compile Docs/cmake-mode.el || die "elisp compile failed"
-	fi
+	use emacs && elisp-compile Docs/cmake-mode.el
 }
 
-src_test() {
+_run_test() {
 	# fix OutDir test
+	# this is altered thanks to our eclass
 	sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
 	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-	"${CMAKE_BUILD_DIR}"/bin/ctest || die "Tests failed"
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
+	#        as it was never intended to be used this way.
+	"${CMAKE_BUILD_DIR}"/bin/ctest \
+		-E BootstrapTest SimpleCOnly_sdcc \
+		|| die "Tests failed"
 	popd > /dev/null
 }
 
+src_test() {
+	VIRTUALX_COMMAND="_run_test" virtualmake
+}
+
 src_install() {
 	cmake-utils_src_install
 	if use emacs; then
-		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed"
+		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins Docs/cmake-syntax.vim || die
+		doins Docs/cmake-syntax.vim
 
 		insinto /usr/share/vim/vimfiles/indent
-		doins Docs/cmake-indent.vim || die
+		doins Docs/cmake-indent.vim
 
 		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}/${VIMFILE}" || die
+		doins "${FILESDIR}/${VIMFILE}"
 	fi
 }
 
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch b/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch
new file mode 100644
index 000000000000..1e2b99c20f86
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch
@@ -0,0 +1,219 @@
+--- cmake-2.8.4/usr/share/cmake/Modules/FindQt4.cmake.org	2011-03-09 19:08:15.384000064 +0100
++++ cmake-2.8.4/usr/share/cmake/Modules/FindQt4.cmake	2011-03-09 19:09:18.162000065 +0100
+@@ -835,7 +835,7 @@
+               PATHS
+               ${QT_HEADERS_DIR}/${QT_MODULE}
+               ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
+-              NO_DEFAULT_PATH
++              NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+       )
+     # phonon doesn't seem consistent, let's try phonondefs.h for some
+     # installations
+@@ -844,7 +844,7 @@
+                 PATHS
+                 ${QT_HEADERS_DIR}/${QT_MODULE}
+                 ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
+-                NO_DEFAULT_PATH
++                NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+         )
+     ENDIF(${QT_MODULE} STREQUAL "phonon")
+   ENDFOREACH(QT_MODULE)
+@@ -854,11 +854,11 @@
+     # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
+     FIND_PATH(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
+       PATHS ${QT_HEADERS_DIR}/ActiveQt
+-      NO_DEFAULT_PATH
++      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+       )
+     FIND_PATH(QT_QAXSERVER_INCLUDE_DIR ActiveQt
+       PATHS ${QT_HEADERS_DIR}/ActiveQt
+-      NO_DEFAULT_PATH
++      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+       )
+   ENDIF(Q_WS_WIN)
+ 
+@@ -867,7 +867,7 @@
+     PATHS
+     ${QT_HEADERS_DIR}/QtDesigner
+     ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+   
+   # Set QT_QTASSISTANT_INCLUDE_DIR
+@@ -875,7 +875,7 @@
+     PATHS
+     ${QT_HEADERS_DIR}/QtAssistant
+     ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+   
+   # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
+@@ -883,7 +883,7 @@
+     PATHS
+     ${QT_HEADERS_DIR}/QtAssistant
+     ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   ########################################
+@@ -897,11 +897,11 @@
+     STRING(TOUPPER ${QT_MODULE} _upper_qt_module)
+     FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE 
+                  NAMES ${QT_MODULE}${QT_LIBINFIX} ${QT_MODULE}${QT_LIBINFIX}4
+-                 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH
++                 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+         )
+     FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG 
+                  NAMES ${QT_MODULE}${QT_LIBINFIX}_debug ${QT_MODULE}${QT_LIBINFIX}d ${QT_MODULE}${QT_LIBINFIX}d4
+-                 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH
++                 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+         )
+   ENDFOREACH(QT_MODULE)
+ 
+@@ -911,26 +911,26 @@
+   ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
+ 
+   # Set QT_QTDESIGNERCOMPONENTS_LIBRARY
+-  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG   NAMES QtDesignerComponents${QT_LIBINFIX}_debug QtDesignerComponents${QT_LIBINFIX}d QtDesignerComponents${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG   NAMES QtDesignerComponents${QT_LIBINFIX}_debug QtDesignerComponents${QT_LIBINFIX}d QtDesignerComponents${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+   # Set QT_QTMAIN_LIBRARY
+   IF(Q_WS_WIN)
+-    FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++    FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+   ENDIF(Q_WS_WIN)
+   
+   # Set QT_QTASSISTANTCLIENT_LIBRARY
+-  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG   NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR}  NO_DEFAULT_PATH)
++  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG   NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR}  NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+   
+   # Set QT_QTASSISTANT_LIBRARY
+-  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG   NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG   NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+   # Set QT_QTHELP_LIBRARY
+-  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} QtCLucene${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG   NAMES QtCLucene${QT_LIBINFIX}_debug QtCLucene${QT_LIBINFIX}d QtCLucene${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} QtCLucene${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG   NAMES QtCLucene${QT_LIBINFIX}_debug QtCLucene${QT_LIBINFIX}d QtCLucene${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+   IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
+     FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR})
+   ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
+@@ -993,67 +993,67 @@
+   FIND_PROGRAM(QT_MOC_EXECUTABLE
+     NAMES moc-qt4 moc
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_UIC_EXECUTABLE
+     NAMES uic-qt4 uic
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_UIC3_EXECUTABLE
+     NAMES uic3
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_RCC_EXECUTABLE 
+     NAMES rcc
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE 
+     NAMES qdbuscpp2xml
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE 
+     NAMES qdbusxml2cpp
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
+     NAMES lupdate-qt4 lupdate
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
+     NAMES lrelease-qt4 lrelease
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
+     NAMES qcollectiongenerator-qt4 qcollectiongenerator
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
+     NAMES designer-qt4 designer
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
+     NAMES linguist-qt4 linguist
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   IF (QT_MOC_EXECUTABLE)
+@@ -1158,11 +1158,11 @@
+       IF(QT_IS_STATIC)
+         FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_RELEASE
+                      NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4
+-                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
++                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+             )
+         FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_DEBUG
+                      NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4
+-                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
++                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+             )
+         _QT4_ADJUST_LIB_VARS(${QT_PLUGIN})
+       ELSE(QT_IS_STATIC)
+@@ -1171,11 +1171,11 @@
+         SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_MODULE_SUFFIX} ${CMAKE_SHARED_LIBRARY_SUFFIX})
+         FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_RELEASE
+                      NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4
+-                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
++                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+             )
+         FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_DEBUG
+                      NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4
+-                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
++                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+             )
+         MARK_AS_ADVANCED(QT_${_upper_qt_plugin}_PLUGIN_RELEASE QT_${_upper_qt_plugin}_PLUGIN_DEBUG)
+         SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_DEFAULT})