Remove old versions and unused patches.

(Portage version: 2.1.11.3/cvs/Linux x86_64)

6 files changed, 6 insertions, 603 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 50c38ada136c..40b880551fb3 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.204 2012/06/17 16:35:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.205 2012/06/28 15:47:02 kensington Exp $
+
+  28 Jun 2012; Michael Palimaka <kensington@gentoo.org> -cmake-2.8.7-r4.ebuild,
+  -cmake-2.8.8-r2.ebuild, -files/cmake-2.8.3-fix_assembler_test.patch,
+  -files/cmake-2.8.4-FindPythonInterp.patch, -files/cmake-2.8.4-FindQt4.patch:
+  Remove old versions and unused patches.
 
   17 Jun 2012; Fabian Groffen <grobian@gentoo.org> cmake-2.8.8-r3.ebuild:
   Run bootstrap with CONFIG_SHELL or (Prefix) sh, since the script is not
@@ -898,4 +903,3 @@
   08 Dec 2003; Lisa Seelye <lisa@gentoo.org> cmake-1.8.1.ebuild:
   Initial checkin. Submitted by Sam Yates <sam@quux.dropbear.id.au> to close bug
   25334.
-
diff --git a/dev-util/cmake/cmake-2.8.7-r4.ebuild b/dev-util/cmake/cmake-2.8.7-r4.ebuild
deleted file mode 100644
index 3d06623d84c7..000000000000
--- a/dev-util/cmake/cmake-2.8.7-r4.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.7-r4.ebuild,v 1.2 2012/05/02 22:05:10 jdhore Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
-	>=app-arch/libarchive-2.8.0
-	>=net-misc/curl-7.20.0-r1[ssl]
-	>=dev-libs/expat-2.0.1
-	virtual/pkgconfig
-	sys-libs/zlib
-	ncurses? ( sys-libs/ncurses )
-	qt4? ( x11-libs/qt-gui:4 )
-"
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-# Fixme:
-# Boost patchset is foobared and should respect eselect / slotting
-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.1-libform.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch
-	"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-2.8.7-FindOpenMP.patch
-	"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
-)
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	tc-export CC CXX LD
-
-	./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_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
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# 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 ${ctestargs} \
-		-E BootstrapTest SimpleCOnly_sdcc \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-pkg_setup() {
-	einfo "Fixing java access violations ..."
-	# bug 387227
-	addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	cmake_src_bootstrap
-}
-
-src_configure() {
-	# make things work with gentoo java setup
-	# in case java-config cannot be run, the variable just becomes unset
-	# per bug #315229
-	export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		$(cmake-utils_use_build ncurses CursesDialog)
-		$(cmake-utils_use_build qt4 QtDialog)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use emacs; then
-		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
-
-		insinto /usr/share/vim/vimfiles/indent
-		doins Docs/cmake-indent.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}/${VIMFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.8.8-r2.ebuild b/dev-util/cmake/cmake-2.8.8-r2.ebuild
deleted file mode 100644
index 1213feec72c4..000000000000
--- a/dev-util/cmake/cmake-2.8.8-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.8-r2.ebuild,v 1.2 2012/05/12 13:57:55 aballier Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
-	>=app-arch/libarchive-2.8.0
-	>=net-misc/curl-7.20.0-r1[ssl]
-	>=dev-libs/expat-2.0.1
-	virtual/pkgconfig
-	sys-libs/zlib
-	ncurses? ( sys-libs/ncurses )
-	qt4? ( x11-libs/qt-gui:4 )
-"
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-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.1-libform.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
-	"${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
-	"${FILESDIR}"/${PN}-2.8.8-pkgconfig.patch
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	tc-export CC CXX LD
-
-	./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_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
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# 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 ${ctestargs} \
-		-E BootstrapTest SimpleCOnly_sdcc \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-pkg_setup() {
-	einfo "Fixing java access violations ..."
-	# bug 387227
-	addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	cmake_src_bootstrap
-}
-
-src_configure() {
-	# make things work with gentoo java setup
-	# in case java-config cannot be run, the variable just becomes unset
-	# per bug #315229
-	export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		$(cmake-utils_use_build ncurses CursesDialog)
-		$(cmake-utils_use_build qt4 QtDialog)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use emacs; then
-		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
-
-		insinto /usr/share/vim/vimfiles/indent
-		doins Docs/cmake-indent.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}/${VIMFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/cmake-2.8.3-fix_assembler_test.patch b/dev-util/cmake/files/cmake-2.8.3-fix_assembler_test.patch
deleted file mode 100644
index 0ea02b155278..000000000000
--- a/dev-util/cmake/files/cmake-2.8.3-fix_assembler_test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN cmake-2.8.3.orig/Tests/Assembler/CMakeLists.txt cmake-2.8.3/Tests/Assembler/CMakeLists.txt
---- cmake-2.8.3.orig/Tests/Assembler/CMakeLists.txt	2010-12-25 16:56:42.646163500 +0100
-+++ cmake-2.8.3/Tests/Assembler/CMakeLists.txt	2010-12-25 20:18:17.156163502 +0100
-@@ -11,8 +11,11 @@
-     enable_language(ASM-ATT OPTIONAL)
-     if(CMAKE_ASM-ATT_COMPILER_WORKS)
-       message(STATUS "Trying to enable ASM-ATT for Linux/x86 - succeeded")
--      # this assembler file was created using gcc -S main.c
--      set(SRCS main-linux-x86-gas.s)
-+      # generate assembler file
-+	  execute_process(COMMAND ${CMAKE_C_COMPILER} -S
-+			  "${CMAKE_CURRENT_SOURCE_DIR}/main.c" -o
-+			  "${CMAKE_CURRENT_BINARY_DIR}/main-linux-x86-gas.s")
-+	  set(SRCS ${CMAKE_CURRENT_BINARY_DIR}/main-linux-x86-gas.s)
-     endif(CMAKE_ASM-ATT_COMPILER_WORKS)
-   endif(CMAKE_SYSTEM MATCHES Linux OR CMAKE_SYSTEM MATCHES FreeBSD)
- endif(NOT SRCS AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86$")
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonInterp.patch
deleted file mode 100644
index 90a34aad0e83..000000000000
--- a/dev-util/cmake/files/cmake-2.8.4-FindPythonInterp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN cmake-2.8.4.old/Modules/FindPythonInterp.cmake cmake-2.8.4/Modules/FindPythonInterp.cmake
---- cmake-2.8.4.old/Modules/FindPythonInterp.cmake	2011-02-20 19:32:16.545655003 +0100
-+++ cmake-2.8.4/Modules/FindPythonInterp.cmake	2011-02-20 20:22:37.597936743 +0100
-@@ -26,6 +26,7 @@
-   ${Python_ADDITIONAL_VERSIONS}
-   2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
- 
-+set(_Python_VERSIONS "")
- # Run first with the Python version in the executable
- foreach(_CURRENT_VERSION ${_Python_VERSIONS})
-   set(_Python_NAMES python${_CURRENT_VERSION})
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch b/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch
deleted file mode 100644
index 1e2b99c20f86..000000000000
--- a/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch
+++ /dev/null
@@ -1,219 +0,0 @@
---- 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})