[dev-util/cmake] Move fix to tree

20 files changed, 0 insertions, 835 deletions

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
deleted file mode 100644
index cdf37348db1..00000000000
--- a/dev-util/cmake/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00
-AUX cmake-2.6.0-interix.patch 1657 RMD160 fe2e9675da5b66c041d8ae5f1c667cf605494674 SHA1 d21fa5346a939411d579ab308005f7867f012975 SHA256 944401813cd66fdefc68935778fc3fe2328f17a2f00d559dac8add63bb37faf7
-AUX cmake-2.6.3-darwin-bundle.patch 952 RMD160 157295c7080e3fa5a1414c6f7efba4877049c5e7 SHA1 595740c64fd64e93763d7b1f59d341f9f8117482 SHA256 5429d3d7ba0d2bf2528b4cbf2bd36d3c83a051c064faa9c308d9adfeee334bca
-AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 RMD160 38094f9f8516656cc30d6ead147bc1e2ae41f429 SHA1 5458b92849292d9e8ca3003654a94e339cb4a48c SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439
-AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 RMD160 d927ce8bb08d57f452db3371a0b2e11d252b96c9 SHA1 6f88171a816c1157ddcf3c3d5c3e3ec080471883 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7
-AUX cmake-2.6.4-FindBoost.patch 1094 RMD160 58cbed09bcb5fadf166cf64481f9605b5882f6a2 SHA1 5a3a91737b436e9de50c955bdb3e32b8fa7bed30 SHA256 a3f266086335b96af8e0dd848a05a10373762de9b9d6cc3b8af4b27fb43d362c
-AUX cmake-2.8.0-darwin-default-install_name.patch 911 RMD160 6261482ff3f989ce455ea87cd5c540385420149b SHA1 6c473a538204826210f62fabdfafb2f5f19087bb SHA256 98b93389ad9a39c819b90f8694a9fb208da6bad15dbe1ca72e62783803ff5b6d
-AUX cmake-2.8.0-darwin-no-app-with-qt.patch 2983 RMD160 088b54f0c1fd7d43867c0479deee0caada3a5fcd SHA1 1737e954c7bbb55f007226c48feac596ac290c45 SHA256 f678cb03ee646a231eedda894e8965bf7bc83b693b249e1ecd4590e933323224
-AUX cmake-2.8.0-more-no_host_paths.patch 2981 RMD160 4a6de86385e6bc0c42d49c4860300d590077cc81 SHA1 f13b33f5f8724590ff5edd57486c079fffd08f4b SHA256 e3b6a554239ee0cfc2dcac5298b702d9eca4b403f5839db9bb6ad3f42cfd6d81
-AUX cmake-2.8.1-FindBoost.patch 714 RMD160 8f7d2be9cc63289a3e4f79b43f4b8baa6d980810 SHA1 37925b584dc471148f756bd41158740704dbec37 SHA256 f110d2387c362c518480d804bf1ce9f4881af67755cafd41bb639b09a8afca88
-AUX cmake-2.8.1-libform.patch 1818 RMD160 ca954dfe966cd73836ef9e01ffe8f0eda85f2f91 SHA1 8f8e9a0002b4a95cea7dcfc36c2df16c47008bec SHA256 3b4ee03c7733b3fb468c5d4c6b139358be751b2398b56ca4ecdbf8a86b1f1ed5
-AUX cmake-2.8.1-more-no_host_paths.patch 2981 RMD160 fea9f1d96d8c29f55e424389fb4f2471dfe514d8 SHA1 90fdc2ad69aeb54530d1faf4867e40c233caf084 SHA256 0c3fbe76684851ee444be92a99f91e5a5e8dfef02d7426722e10025aeca03412
-AUX cmake-2.8.1-mpi.patch 857 RMD160 d41e4dd445b1a79d0a82619a8ad7371e80d937a8 SHA1 0192124d023953d35cb5fb0da148c914525099e6 SHA256 64092fbf637bfe625cf58abe93844aab2e75ba22a00e5ffdb05188961b7f51d7
-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
-EBUILD cmake-2.8.1-r2.ebuild 4258 RMD160 c32b008210fac67d42b9984494fb234d3e2f134b SHA1 de8d94a03a4b3ceb4a76460fdd112645e4559e4a SHA256 26b9f84b9e1af366dbe1a48d4a951e6de4625f1d758080084a709f9177a9725e
-MISC ChangeLog 21066 RMD160 bc9368257bb5b74c1a24f903b3685f296ed811e5 SHA1 bc0ae6755b3dd670f63b2f28c18cbeeb061341e0 SHA256 3c8b649daa21cad4aa20b33c574cbb8122f0a8001c97a05aff0bc7a164017544
-MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/cmake/cmake-2.8.1-r2.ebuild b/dev-util/cmake/cmake-2.8.1-r2.ebuild
deleted file mode 100644
index a86f9ccf1af..00000000000
--- a/dev-util/cmake/cmake-2.8.1-r2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils
-
-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="
-	>=net-misc/curl-7.20.0-r1[ssl]
-	>=dev-libs/expat-2.0.1
-	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_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-FindPythonInterp.patch
-	"${FILESDIR}"/${PN}-2.6.0-interix.patch
-	"${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-more-no_host_paths.patch
-	"${FILESDIR}"/${PN}-2.8.1-FindBoost.patch
-	"${FILESDIR}"/${PN}-2.8.1-libform.patch
-	"${FILESDIR}"/${PN}-2.8.1-mpi.patch
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# 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"
-}
-
-src_configure() {
-	if [[ "$(gcc-major-version)" -eq "3" ]] ; then
-		append-flags "-fno-stack-protector"
-	fi
-
-	# make things work with gentoo java setup
-	# in case java-config cannot be run, the variable just becomes unset
-	export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
-	bootstrap=0
-	has_version ">=dev-util/cmake-2.6.1" || bootstrap=1
-	if [[ ${bootstrap} = 0 ]]; then
-		# Required version of CMake found, now test if it works
-		cmake --version &> /dev/null || bootstrap=1
-	fi
-
-	if [[ ${bootstrap} = 1 ]]; then
-		local qt_arg par_arg
-		tc-export CC CXX LD
-
-		if use qt4; then
-			qt_arg="--qt-gui"
-		else
-			qt_arg="--no-qt-gui"
-		fi
-
-		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
-
-		./bootstrap \
-			--system-libs \
-			--prefix="${EPREFIX}"/usr \
-			--docdir=/share/doc/${PF} \
-			--datadir=/share/${PN} \
-			--mandir=/share/man \
-			"$qt_arg" \
-			"$par_arg" || die "./bootstrap failed"
-	else
-		# this is way much faster so we should prefer it if some cmake is
-		# around.
-		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
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use emacs; then
-		elisp-compile Docs/cmake-mode.el || die "elisp compile failed"
-	fi
-}
-
-src_test() {
-	emake test || die "Tests failed"
-}
-
-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-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/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
deleted file mode 100644
index e4a1a6d47cb..00000000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t)
-(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
-(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
diff --git a/dev-util/cmake/files/cmake-2.6.0-interix.patch b/dev-util/cmake/files/cmake-2.6.0-interix.patch
deleted file mode 100644
index 0f0f1db0a90..00000000000
--- a/dev-util/cmake/files/cmake-2.6.0-interix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ruN cmake-2.6.0.orig/Modules/Platform/Interix.cmake cmake-2.6.0/Modules/Platform/Interix.cmake
---- cmake-2.6.0.orig/Modules/Platform/Interix.cmake	1970-01-01 01:00:00 +0100
-+++ cmake-2.6.0/Modules/Platform/Interix.cmake	2008-06-02 14:22:45 +0200
-@@ -0,0 +1,31 @@
-+# This is a proposed Platform definition for Interix GCC/G++
-+
-+SET(CMAKE_DL_LIBS "dl")
-+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
-+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
-+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
-+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
-+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-h,")
-+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-h,")
-+
-+SET(UNIX 1)
-+
-+# also add the install directory of the running cmake to the search directories
-+# CMAKE_ROOT is CMAKE_INSTALL_PREFIX/share/cmake, so we need to go two levels up
-+GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH)
-+GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
-+
-+LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
-+	"${_CMAKE_INSTALL_DIR}"
-+	"${CMAKE_INSTALL_PREFIX}"
-+	)
-+
-+LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
-+	"${CMAKE_INSTALL_PREFIX}"/include
-+	)
-+
-+LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
-+	"${CMAKE_INSTALL_PREFIX}"/lib
-+	)
-+
-diff -ruN cmake-2.6.0.orig/Utilities/cmtar/encode.c cmake-2.6.0/Utilities/cmtar/encode.c
---- cmake-2.6.0.orig/Utilities/cmtar/encode.c	2008-06-02 13:00:44 +0200
-+++ cmake-2.6.0/Utilities/cmtar/encode.c	2008-06-02 14:02:39 +0200
-@@ -24,6 +24,9 @@
- # include <stdlib.h>
- #endif
- 
-+#ifdef HAVE_SYS_MKDEV_H
-+# include <sys/mkdev.h>
-+#endif
- 
- /* magic, version, and checksum */
- void
diff --git a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
deleted file mode 100644
index 6ee9b709dff..00000000000
--- a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't use .so for modules on darwin/macos. Use .bundle instead.
-Patch by Heiko Przybyl
-
---- Modules/Platform/Darwin.cmake
-+++ Modules/Platform/Darwin.cmake
-@@ -23,7 +23,7 @@
- SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")
- SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
- SET(CMAKE_SHARED_MODULE_PREFIX "lib")
--SET(CMAKE_SHARED_MODULE_SUFFIX ".so")
-+SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
- SET(CMAKE_MODULE_EXISTS 1)
- SET(CMAKE_DL_LIBS "")
- 
-@@ -45,7 +45,7 @@
- SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
- SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
- SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
--SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
-+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
- 
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
deleted file mode 100644
index 02c3011c8f7..00000000000
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://public.kitware.com/Bug/view.php?id=7933
-
-diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx
---- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx	Wed Sep 24 20:34:37 2008
-+++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx	Tue Nov  4 11:18:32 2008
-@@ -38,6 +38,13 @@
- int main() { return 0; }
- #endif
- 
-+#ifdef TEST_KWSYS_LFS_SUPPORT
-+#define _LARGE_FILES
-+#include <iostream>
-+int main() { return 0; }
-+#endif
-+
-+
- #ifdef TEST_KWSYS_IOS_HAVE_STD
- #include <iosfwd>
- void f(std ::ostream*) {}
-diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap
---- cmake-2.6.2/bootstrap	Wed Sep 24 20:34:33 2008
-+++ cmake-2.6.2-p/bootstrap	Tue Nov  4 11:17:11 2008
-@@ -1005,6 +1005,16 @@
-   echo "${cmake_cxx_compiler} does not have stl iterator_traits"
- fi
- 
-+if cmake_try_run "${cmake_cxx_compiler}" \
-+  "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \
-+  "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then
-+  KWSYS_LFS_AVAILABLE=1
-+  echo "LFS support available"
-+else
-+  KWSYS_LFS_AVAILABLE=0
-+  echo "LFS support unavailable, disabled"
-+fi
-+
- if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then
-   if cmake_try_run "${cmake_cxx_compiler}" \
-     "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \
diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
deleted file mode 100644
index ceb205ff586..00000000000
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch by Heiko Przybyl
-
---- Source/cmComputeLinkInformation.cxx
-+++ Source/cmComputeLinkInformation.cxx
-@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge
-   for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin();
-       ri != runtimeDirs.end(); ++ri)
-     {
-+      // Do not add duplicates.
-+      // I'd like to have that check already in the list generation code
-+      // but that would need lots of more changes, even in ExpandListArgument().
-+      if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos)
-+        {
-+          //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl;
-+          continue;
-+        }
-     // Separate from previous path.
-     rpath += sep;
-     sep = this->GetRuntimeSep().c_str();
diff --git a/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch b/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch
deleted file mode 100644
index a251d4fd1c1..00000000000
--- a/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Modules/FindBoost.cmake
-+++ Modules/FindBoost.cmake
-@@ -57,7 +57,8 @@
- #
- # Currently this module searches for the following version numbers:
- # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
--# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
-+# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
-+# 1.40, 1.40.0, 1.41, 1.41.0, 1.42, 1.42.0, 1.43, 1.43.0, 1.44, 1.44.0
- #
- # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
- # add both 1.x and 1.x.0 as shown above.  Official Boost include directories
-@@ -271,7 +272,8 @@
-   # The user has not requested an exact version.  Among known
-   # versions, find those that are acceptable to the user request.
-   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
--    "1.38.0" "1.38" "1.37.0" "1.37"
-+    "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42" "1.41.0" "1.41"
-+    "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
-     "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
-     "1.34" "1.33.1" "1.33.0" "1.33")
-   set(_boost_TEST_VERSIONS)
diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
deleted file mode 100644
index 4ef0c7b4b6f..00000000000
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-The install_name of a library can be compared to the ELF soname, setting
-it to just the library name (libx.1.dylib) is not sufficient on Mach-O,
-as it uses full paths.  Most apps have no clue about that, so they don't
-do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html
-
-Provide a sane default that will allow merging most cmake-based
-packages.  If this location is not correct, Portage's QA checks will
-catch that.
-
---- Source/cmTarget.cxx
-+++ Source/cmTarget.cxx
-@@ -974,7 +974,7 @@
-                        this->Makefile->IsOn("MINGW"));
- 
-   // Setup default property values.
--  this->SetPropertyDefault("INSTALL_NAME_DIR", "");
-+  this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib");
-   this->SetPropertyDefault("INSTALL_RPATH", "");
-   this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF");
-   this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF");
diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch
deleted file mode 100644
index 8149917d0a4..00000000000
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Description: Don't build the GUI's app-bundle.
-Author:	     Heiko Przybyl <zuxez@cs.tu-berlin.de>
---- cmake-2.8.0/CMakeLists.txt.orig	2010-02-10 19:38:03 +0100
-+++ cmake-2.8.0/CMakeLists.txt	2010-02-10 19:38:49 +0100
-@@ -381,7 +381,7 @@ IF(BUILD_CursesDialog)
- ENDIF(BUILD_CursesDialog)
- 
- IF(BUILD_QtDialog)
--  IF(APPLE)
-+  IF(FALSE)
-     SET(CMAKE_BUNDLE_NAME
-       "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
-     SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
-@@ -394,7 +394,7 @@ IF(BUILD_QtDialog)
-     ENDIF(NOT "${ENDCH}" STREQUAL "/")
-     SET(CMAKE_INSTALL_PREFIX 
-       "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
--  ENDIF(APPLE)
-+  ENDIF(FALSE)
-   
-   SET(QT_NEED_RPATH FALSE)
-   IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
---- cmake-2.8.0/Source/QtDialog/CMakeLists.txt.orig	2010-02-10 19:39:59 +0100
-+++ cmake-2.8.0/Source/QtDialog/CMakeLists.txt	2010-02-10 19:42:12 +0100
-@@ -66,12 +66,12 @@ ELSE(NOT QT4_FOUND)
-   IF(Q_WS_WIN)
-     SET(SRCS ${SRCS} CMakeSetup.rc)
-   ENDIF(Q_WS_WIN)
--  IF(Q_WS_MAC)
-+  IF(FALSE)
-     SET(SRCS ${SRCS} CMakeSetup.icns)
-     SET(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
-     SET_SOURCE_FILES_PROPERTIES(CMakeSetup.icns PROPERTIES
-       MACOSX_PACKAGE_LOCATION Resources)
--  ENDIF(Q_WS_MAC)
-+  ENDIF(FALSE)
- 
-   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-@@ -79,13 +79,13 @@ ELSE(NOT QT4_FOUND)
-   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
- 
--  ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-+  ADD_EXECUTABLE(cmake-gui WIN32 ${SRCS})
-   TARGET_LINK_LIBRARIES(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
-   IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
--    IF(APPLE)
-+    IF(FALSE)
-       SET_TARGET_PROPERTIES(cmake-gui PROPERTIES
-        OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
--    ENDIF(APPLE)
-+    ENDIF(FALSE)
-     SET(CMAKE_INSTALL_DESTINATION_ARGS 
-       BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
-   ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
-@@ -101,7 +101,7 @@ ELSE(NOT QT4_FOUND)
-     INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
-   ENDIF(UNIX)
- 
--  IF(APPLE)
-+  IF(FALSE)
-     SET(CMAKE_POSTFLIGHT_SCRIPT
-       "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
-     SET(CMAKE_POSTUPGRADE_SCRIPT
-@@ -115,7 +115,7 @@ ELSE(NOT QT4_FOUND)
-     INSTALL(CODE "set(input_file
-        \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/${CMAKE_BUNDLE_NAME}\")")
-     INSTALL(SCRIPT "${CMake_SOURCE_DIR}/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake")
--  ENDIF(APPLE)
-+  ENDIF(FALSE)
-   CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
-     "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)    
- ENDIF(NOT QT4_FOUND)
\ No newline at end of file
diff --git a/dev-util/cmake/files/cmake-2.8.0-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.0-more-no_host_paths.patch
deleted file mode 100644
index a4cdf3905a1..00000000000
--- a/dev-util/cmake/files/cmake-2.8.0-more-no_host_paths.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Set some proper paths to make cmake find our tools.
-Original patch by Heiko Przybyl
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
---- cmake-2.8.0/Modules/Platform/Darwin.cmake
-+++ cmake-2.8.0/Modules/Platform/Darwin.cmake
-@@ -213,19 +213,23 @@
- 
- 
-  
--# default to searching for frameworks first
--SET(CMAKE_FIND_FRAMEWORK FIRST)
-+# default to searching for frameworks last
-+SET(CMAKE_FIND_FRAMEWORK LAST)
- # set up the default search directories for frameworks
- SET(CMAKE_SYSTEM_FRAMEWORK_PATH
-+  @GENTOO_PORTAGE_EPREFIX@Frameworks
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-   ~/Library/Frameworks
-   /Library/Frameworks
-   /Network/Library/Frameworks
-   /System/Library/Frameworks)
- 
--# default to searching for application bundles first
--SET(CMAKE_FIND_APPBUNDLE FIRST)
-+# default to searching for application bundles last
-+SET(CMAKE_FIND_APPBUNDLE LAST)
- # set up the default search directories for application bundles
- SET(CMAKE_SYSTEM_APPBUNDLE_PATH
-+  @GENTOO_PORTAGE_EPREFIX@Applications
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-   ~/Applications
-   /Applications
-   /Developer/Applications)
---- cmake-2.8.0/Modules/Platform/UnixPaths.cmake
-+++ cmake-2.8.0/Modules/Platform/UnixPaths.cmake
-@@ -33,6 +33,7 @@
- # search types.
- LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
-   # Standard
-+  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@ @GENTOO_PORTAGE_EPREFIX@usr
-   /usr/local / /usr
- 
-   # CMake install location
-@@ -44,43 +45,39 @@
- 
- # List common include file locations not under the common prefixes.
- LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
--  # Windows API on Cygwin
--  /usr/include/w32api
--
--  # X11
--  /usr/X11R6/include /usr/include/X11
--
--  # Other
--  /opt/local/include /usr/pkg/include
--  /opt/csw/include /opt/include  
--  /usr/openwin/include
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   )
- 
- LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
--  # Windows API on Cygwin
--  /usr/lib/w32api
--
--  # X11
--  /usr/X11R6/lib /usr/lib/X11
--
--  # Other
--  /opt/local/lib /usr/pkg/lib
--  /opt/csw/lib /opt/lib 
--  /usr/openwin/lib
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-   )
- 
- LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
--  /usr/pkg/bin
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-+  @GENTOO_PORTAGE_EPREFIX@bin
-   )
- 
- LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-   /lib /usr/lib /usr/lib32 /usr/lib64
-   )
- 
- LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
-   )
- LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
-   )
- 
diff --git a/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch b/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch
deleted file mode 100644
index 56fb152d663..00000000000
--- a/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u -r cmake-2.8.1.orig/Modules/FindBoost.cmake cmake-2.8.1/Modules/FindBoost.cmake
---- cmake-2.8.1.orig/Modules/FindBoost.cmake	2010-03-16 21:29:29.000000000 +0100
-+++ cmake-2.8.1/Modules/FindBoost.cmake	2010-04-04 19:52:50.000000000 +0200
-@@ -70,7 +70,9 @@
- # omit the 3rd version number from include paths if it is 0 although not all
- # binary Boost releases do so.
- #
--# SET(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
-+SET(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48"
-+    "1.47.0" "1.47" "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0"
-+    "1.43" "1.42.0" "1.42")
- #
- # ===================================== ============= ========================
- #
diff --git a/dev-util/cmake/files/cmake-2.8.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch
deleted file mode 100644
index 87c724776e5..00000000000
--- a/dev-util/cmake/files/cmake-2.8.1-libform.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt
---- cmake-2.8.1.medium/CMakeLists.txt	2010-03-16 21:29:28.000000000 +0100
-+++ cmake-2.8.1/CMakeLists.txt	2010-04-04 20:04:47.000000000 +0200
-@@ -314,9 +314,6 @@
-   ELSE (UNIX)
-     SET(BUILD_CursesDialog 0)
-   ENDIF (UNIX)
--  IF(BUILD_CursesDialog)
--    ADD_SUBDIRECTORY(Source/CursesDialog/form)
--  ENDIF(BUILD_CursesDialog)
- ENDMACRO (CMAKE_BUILD_UTILITIES)
- 
- 
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt
---- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt	2010-03-16 21:29:34.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt	2010-04-04 20:01:38.000000000 +0200
-@@ -25,13 +25,18 @@
-               CursesDialog/ccmake
-    )
- 
--INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
--                    ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
- 
- 
- ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
- TARGET_LINK_LIBRARIES(ccmake CMakeLib)
--TARGET_LINK_LIBRARIES(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+  TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
- 
- INSTALL_TARGETS(/bin ccmake)
-+
-+
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h
---- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h	2010-03-16 21:29:35.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h	2010-04-04 20:01:38.000000000 +0200
-@@ -15,8 +15,6 @@
-  #define _MSE_INT_H
- #endif
- 
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch
deleted file mode 100644
index 0558b34e6ef..00000000000
--- a/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Set some proper paths to make cmake find our tools.
-Original patch by Heiko Przybyl
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
---- cmake-2.8.0/Modules/Platform/Darwin.cmake
-+++ cmake-2.8.0/Modules/Platform/Darwin.cmake
-@@ -213,19 +213,23 @@
- 
- 
-  
--# default to searching for frameworks first
--SET(CMAKE_FIND_FRAMEWORK FIRST)
-+# default to searching for frameworks last
-+SET(CMAKE_FIND_FRAMEWORK LAST)
- # set up the default search directories for frameworks
- SET(CMAKE_SYSTEM_FRAMEWORK_PATH
-+  @GENTOO_PORTAGE_EPREFIX@Frameworks
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-   ~/Library/Frameworks
-   /Library/Frameworks
-   /Network/Library/Frameworks
-   /System/Library/Frameworks)
- 
--# default to searching for application bundles first
--SET(CMAKE_FIND_APPBUNDLE FIRST)
-+# default to searching for application bundles last
-+SET(CMAKE_FIND_APPBUNDLE LAST)
- # set up the default search directories for application bundles
- SET(CMAKE_SYSTEM_APPBUNDLE_PATH
-+  @GENTOO_PORTAGE_EPREFIX@Applications
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-   ~/Applications
-   /Applications
-   /Developer/Applications)
---- cmake-2.8.0/Modules/Platform/UnixPaths.cmake
-+++ cmake-2.8.0/Modules/Platform/UnixPaths.cmake
-@@ -33,6 +33,7 @@
- # search types.
- LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
-   # Standard
-+  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
-   /usr/local /usr /
- 
-   # CMake install location
-@@ -44,43 +45,39 @@
- 
- # List common include file locations not under the common prefixes.
- LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
--  # Windows API on Cygwin
--  /usr/include/w32api
--
--  # X11
--  /usr/X11R6/include /usr/include/X11
--
--  # Other
--  /opt/local/include /usr/pkg/include
--  /opt/csw/include /opt/include  
--  /usr/openwin/include
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   )
- 
- LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
--  # Windows API on Cygwin
--  /usr/lib/w32api
--
--  # X11
--  /usr/X11R6/lib /usr/lib/X11
--
--  # Other
--  /opt/local/lib /usr/pkg/lib
--  /opt/csw/lib /opt/lib 
--  /usr/openwin/lib
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-   )
- 
- LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
--  /usr/pkg/bin
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-+  @GENTOO_PORTAGE_EPREFIX@bin
-   )
- 
- LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-   /lib /usr/lib /usr/lib32 /usr/lib64
-   )
- 
- LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
-   )
- LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
-   )
- 
diff --git a/dev-util/cmake/files/cmake-2.