aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMacRoot <root@mac>2013-01-12 18:49:53 +0100
committerMacRoot <root@mac>2013-01-12 18:49:53 +0100
commit5e541879abdbb36c4532db55b3615bc40042d1b6 (patch)
treea93b629e8d40c5b1ede0334bf8a80319742c529d /dev-util
parentAdded local ebuilds from Aug 2007 - Feb 2012 (diff)
downloadAstroFloyd-5e541879abdbb36c4532db55b3615bc40042d1b6.tar.gz
AstroFloyd-5e541879abdbb36c4532db55b3615bc40042d1b6.tar.bz2
AstroFloyd-5e541879abdbb36c4532db55b3615bc40042d1b6.zip
Added all files to git repo
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/cmake/Manifest19
-rw-r--r--dev-util/cmake/cmake-2.8.8-r3.ebuild178
-rw-r--r--dev-util/cmake/files/50cmake-gentoo.el4
-rw-r--r--dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch23
-rw-r--r--dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch39
-rw-r--r--dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch19
-rw-r--r--dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch20
-rw-r--r--dev-util/cmake/files/cmake-2.8.1-libform.patch50
-rw-r--r--dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch12
-rw-r--r--dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch45
-rw-r--r--dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch73
-rw-r--r--dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch44
-rw-r--r--dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch18
-rw-r--r--dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch113
-rw-r--r--dev-util/cmake/files/cmake-2.8.8-pkgconfig.patch62
-rw-r--r--dev-util/cmake/files/cmake-2.8.8-tests.patch58
-rw-r--r--dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch133
-rw-r--r--dev-util/cmake/files/cmake-2.8.9-tests.patch81
-rw-r--r--dev-util/cmake/files/cmake.vim3
-rw-r--r--dev-util/ndiff/ChangeLog11
-rw-r--r--dev-util/ndiff/Manifest4
-rw-r--r--dev-util/ndiff/metadata.xml9
22 files changed, 1018 insertions, 0 deletions
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
new file mode 100644
index 0000000..82eedd3
--- /dev/null
+++ b/dev-util/cmake/Manifest
@@ -0,0 +1,19 @@
+AUX 50cmake-gentoo.el 244 SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 SHA512 70af0b9dd41f08531d3c754dc8af3662df8a22b469b79e8c40b7caae3205be1d4dc81d8b41837d1b6a46f2c348f5407e09e02269823c45c3366777e3bc7a0dcb WHIRLPOOL aa60ffe7e5edd00fdbb32ce2c9aee24fddd6e4d064b8bde55c7ff3b42196c3420596653aade9cc447a3293050c5ab23a27a556f26806e4d67139d264a38d1aaa
+AUX cmake-2.6.3-darwin-bundle.patch 952 SHA256 5429d3d7ba0d2bf2528b4cbf2bd36d3c83a051c064faa9c308d9adfeee334bca SHA512 c355e4f7e578d9837bc172ce22104103f9783390b97cec7bdd2e167880d2c70bc115a1c1146a125e1c501c42c9045d0997ce966edd69fbd791841365fe92c9e0 WHIRLPOOL ecd7cf46c1f07b8bccc8948904710895dd581764f12af5cf0ca0770e9c3b89a30019f59429dc628a42e320e67039ab985e982a3ad6932c7d42c2877af1c9aa7b
+AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439 SHA512 fe3148f9a09363c5943f09b963391a4276f2da6095e66c28a1c365fd655e2124e1931b40890152836e24a3c9e330db799199d8ae295fe4581f7124b42f09f928 WHIRLPOOL 322a805a2df9afa40c7ff217481819462d90d8259856696fa4ef76fda1571fa081577eb8cd06fbee899911b01243a912e43a9dcc667932f9885492fcb92c0f98
+AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7 SHA512 13dfb5d1ed271eaf673aa53c40a5a17a89812c7617e840ffd3df962e9ed6e46da7b507121f56314a2ef8b86a80b2453cf327684e2c4e82bb903cd8210807f507 WHIRLPOOL b43a187a6f90590460b6e499630a6f6d550cee09309c4c32c0b7d68189bcd84dac309ae4b80bc345de5b32dcc4ac94f789c1fea8162cea4175847c49dc862ccf
+AUX cmake-2.8.0-darwin-default-install_name.patch 911 SHA256 98b93389ad9a39c819b90f8694a9fb208da6bad15dbe1ca72e62783803ff5b6d SHA512 53308a020f2fba9e398a3adfc87af57a270cd2aad2aa982ea41a80fc4af9b64f4bfce4499ef7c64794fe1a11b60f28ab4dd95600378523c9397c5d8ab9f94611 WHIRLPOOL b9db2843408df967e6bb07cb34ea56a90982d5e640e59a10ae39436ca9312c32f7b4b4ce058ff8ec06bddd1400957930574191a793af7f930def5ba17f457453
+AUX cmake-2.8.1-libform.patch 1818 SHA256 3b4ee03c7733b3fb468c5d4c6b139358be751b2398b56ca4ecdbf8a86b1f1ed5 SHA512 10ca910bc86c19beb00dc532c076bd0645b9e54a7472e24438f46a6eedce00855017cbe360b5552df05fec9ca5233cd1c2ca13d6f2e103791e9be2a5e23c1c68 WHIRLPOOL 7ea84d6b61a847d70e60380c7a7842e7e0c7d9e55d19c28557ad63e332f48adf0db58b946d00eeaf0842e51d52a2a90a30aca11bf45e6a21ea01b7f8e0fe3557
+AUX cmake-2.8.4-FindPythonLibs.patch 642 SHA256 5c9be7cad3446dc07ad75cc221a2de7df073fb35670ed5325516ef7db4b0c7a3 SHA512 5baa7080e920cf835fcb9defa1298ebb7fde87eb322d6eacde79ae344870a97a4f7d58d307da77c1f4d2beffc1c76058aaa7189b3f4fdd79c6270f6d3f387065 WHIRLPOOL a289a2e82976d7aa3ef2f86aeb394c46df391780d751d2f463ef816a9cf0b7c723cdab32d120ffd90be38daeb4b4baef00cb8597c3e9f9c98a36e6d57ae6b5be
+AUX cmake-2.8.7-FindBLAS.patch 1641 SHA256 be0d7ce6b59171c9e32ce7fe2ab4ae4a351640a7fa07920ae9230047eb0495ac SHA512 91a38e22d183ca4b501b305e6ba5068397b09b02bd39e7bdf27bf4a7771f432acaf099d0840260ce815f4d254d704036d022aaeec5b8c27dea1e4ca78112731b WHIRLPOOL e9734f0671918be36c5c1ec78f5185b21b17ef3a216b2c988d0951652db8c705e587df80f3e2c544c6e5a5080d5fc403a6554724c82055e3448f661df147205a
+AUX cmake-2.8.7-FindBoost-python.patch 5334 SHA256 1f7ab1facbb332cf6a2d6f770ea77eff00cd7137990d3254ee6c1a9ecd22ed68 SHA512 81d6ef46f006a42d1234f7a2aec3e18052ff5f5cca3019b42a5b3be77978babf75265db61eb32b4b28156a320506fbb6f7dc1038c9b01d13ed92cb7d0a25da4e WHIRLPOOL 3f6a52259e85d07e3209b6639fc1ccceda67f80a99f94ebe8a069a67d706e1e6cf16e30c8da0be6eff67793b30c49e006ea9b8d3f7a8cad562f90db5f7eebcdc
+AUX cmake-2.8.7-FindLAPACK.patch 1744 SHA256 5dbbeaf0532fbdbd24f94175f24c26567d1ec32d409d91de9558f7e8f567323e SHA512 c5dab9c697df3593b8fb5222e619ccc1b1cc82beae0cd685ecabb1a0e31193cf663e95dc4d556e338c9f45e451fcb0fbc1a5f0bc39a65c67e6d9d9193f049990 WHIRLPOOL bc42012b830f998c5b8b892b84314fbc5ec6fdbdae627c2364d112a3e48c5350df9334b17e8b91bb4bd6377f10cc927fd3c3c8008370343fc19d43eef1fda005
+AUX cmake-2.8.8-FindPkgConfig.patch 658 SHA256 3261fce9682f476f121aa3d30126e4f8d866b138c887c19d6f47b60df3de9cbe SHA512 b52986a9faf2329096452c3cf4b3066c2eb51b37d057bf46527dc7797fcd795936d63ad287419c2eba6ffcb0134b24544d62fb5c449e6a25354b65a4d5c63d8f WHIRLPOOL b444f6524b1e24d0c1040508babc03b229e7bac7ba11c978d155252fc8df9d052f7f23010c0db027af9f41e594d6ca131e6018f58a21d83f797762ddf644b911
+AUX cmake-2.8.8-more-no_host_paths.patch 3253 SHA256 8cd923e2b9e9f588e5eb00ea7de4eba17585937d913195fc2a8eb78e1819cac6 SHA512 95111576cfebad57dec11ba0218e0097125d99f89991f711e7051a95c49785a1640d2a93e2bdc9ffda51fcbbda6182e1c90bae63898cc88af7a09e97dade1679 WHIRLPOOL c0fec91d4aec045a51edd4a722c9afe1dffc7c25a9034442d108c33d82a8ebd54f2774f3f9c3afabc0ef363260c588a5bef6d78fa034d7e2f6b653ee1fd661ca
+AUX cmake-2.8.8-pkgconfig.patch 2773 SHA256 6e9fd1a691b74facf59dbce344d1dd92fc95da0e8acfc77feb8bf5bab06f50bd SHA512 a17aa40104651841741fd7ea560b96c083096edfee30b21a242efd18f7fb994010f5875bbf3b444627418dd17e5045d55febe1bbcedc721ec4ffe61e8dd5335b WHIRLPOOL 1472d76e96d4a1755f5f13ac053af3f5f9b78465ef7ab753d366ab3b8e13d6cece137e0da88a9252bb16af56dcccd5c4bd4cc3e6a2563972f27ae14e63233867
+AUX cmake-2.8.8-tests.patch 2492 SHA256 07800482bcbf336eafc9132037a26dc16bffc3d31cda8732604c847ea1c1c860 SHA512 675dae75ca54a264f285c7d678669a75f02438de13c6abed52bcd8223e968a8d0474660f0a7e2432d2b90caaf85cdee0489db90366226bcf7b09067b58088611 WHIRLPOOL dd5ce7c898a5cf5776277be2f9d7ee6b51adbe7bcc6dfa0b02df9230f7dab2bbc4bd4dd8ce1fe740b6570714cc93bdfcd759cab40dadb389e8010e3971df6b98
+AUX cmake-2.8.9-more-no_host_paths.patch 4177 SHA256 376586fd32013150f75aed0b48e54751d9770e9b4756de60eb0a62005894538f SHA512 beb0b2849afbd50bf2cd6562392f96aff351578c873f7d117c4f5cfc5c25bfb3fc4f55cdc78824a2fca81e555ddb111c874086e5862e748a5dd1ab1fb2712c86 WHIRLPOOL 3b12790baac161c487df61077031d9452fe1e195d3028bf6024866c8436e08a51f64315d8fb6dfb648b32750e071faa2cf790ef19e0c12e75f48b85451b10ac1
+AUX cmake-2.8.9-tests.patch 3259 SHA256 969187f56aa38132c3e97e6fdee5f1ee0b028627cf86bdb81a9d6108c432214e SHA512 c2a4f79d6d1d28f8db1ac7c367bd868ff1b931415e12b55b312ce2b037b02d59995d5930cc8c9163784c43cd9c108da4b37daefd089fc2cfe04e582801b5a0b8 WHIRLPOOL 5bb7c23080c44d643cec78be172f6a2ffea6df8d2cb0aa85306edfe45a7de9eb92aa548fc4cc6adac9ca7c00f143d66bb1456e255b9d68f241252cf89db60b60
+AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
+DIST cmake-2.8.8.tar.gz 5691656 SHA256 2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46 SHA512 db31b1335c9964504a080a665c9e23010e081e973ba948b2d55a5adff76183271677c94830f2b604b06337df110eec29a8e8749795576c662c0b2f50fe69c882 WHIRLPOOL 2d0f388de643801cf2f389e9a84d218f09be28226e9b2e11d4a1f60222e3dfdd861b603f919b4b321c926612035944a4903ba4efd1d5397ae56068bfef40e6bd
+EBUILD cmake-2.8.8-r3.ebuild 4927 SHA256 1091cd73137f3a3beacb08b2bfd4c2399c67f21f92e7924d919ae63cb944a00b SHA512 ca17b0650b1ec7de1a5ebefda90284a8a198eee790d458df2749809f3b3b9c7c6d62cd5951a97cc6841e037c00fd733b75ca635b820f51cd5af18f734c55bc54 WHIRLPOOL fdfe46a0209172ecd97ff317229574bff1775e7f97c58aeac33a61a21b21f86dbf11468778d0a5c7043fd6bca85ec7758728196d71230946713297acad7edd36
diff --git a/dev-util/cmake/cmake-2.8.8-r3.ebuild b/dev-util/cmake/cmake-2.8.8-r3.ebuild
new file mode 100644
index 0000000..c733654
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.8-r3.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/Attic/cmake-2.8.8-r3.ebuild,v 1.10 2012/10/01 11:28:38 johu dead $
+
+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 script isn't exactly /bin/sh compatible
+ ${CONFIG_SHELL:-sh} ./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/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
new file mode 100644
index 0000000..e4a1a6d
--- /dev/null
+++ b/dev-util/cmake/files/50cmake-gentoo.el
@@ -0,0 +1,4 @@
+(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.3-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
new file mode 100644
index 0000000..6ee9b70
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 0000000..02c3011
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 0000000..ceb205f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
@@ -0,0 +1,19 @@
+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.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
new file mode 100644
index 0000000..4ef0c7b
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
@@ -0,0 +1,20 @@
+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.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch
new file mode 100644
index 0000000..87c7247
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.1-libform.patch
@@ -0,0 +1,50 @@
+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.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
new file mode 100644
index 0000000..28d2e4f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
@@ -0,0 +1,12 @@
+diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake
+--- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100
++++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100
+@@ -33,6 +33,8 @@
+ ${Python_ADDITIONAL_VERSIONS}
+ 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+
++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++ OUTPUT_VARIABLE _Python_VERSIONS)
+ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
+ STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+ IF(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
new file mode 100644
index 0000000..a91214c
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
@@ -0,0 +1,45 @@
+diff -ruN cmake-2.8.7.orig/Modules/FindBLAS.cmake cmake-2.8.7/Modules/FindBLAS.cmake
+--- cmake-2.8.7.orig/Modules/FindBLAS.cmake 2011-12-30 17:49:56.000000000 +0100
++++ cmake-2.8.7/Modules/FindBLAS.cmake 2012-03-08 05:38:47.000000000 +0100
+@@ -1,3 +1,9 @@
++#
++# Version modified for Gentoo Linux
++# If a valid PkgConfig configuration for blas is found, this overrides and cancels
++# all further checks.
++#
++
+ # - Find BLAS library
+ # This module finds an installed fortran library that implements the BLAS
+ # linear-algebra interface (see http://www.netlib.org/blas/).
+@@ -39,6 +45,24 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PC_BLAS blas)
++if(PC_BLAS_FOUND)
++ foreach(PC_LIB ${PC_BLAS_LIBRARIES})
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
++ if (NOT ${PC_LIB}_LIBRARY)
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
++ endif (NOT ${PC_LIB}_LIBRARY)
++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
++ endforeach(PC_LIB)
++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
++ mark_as_advanced(BLAS_LIBRARIES)
++else(PC_BLAS_FOUND)
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
++
+ include(CheckFunctionExists)
+ include(CheckFortranFunctionExists)
+
+@@ -622,3 +646,6 @@
+ endif(BLA_F95)
+
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(PC_BLAS_FOUND)
++
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch
new file mode 100644
index 0000000..edaa91f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch
@@ -0,0 +1,73 @@
+--- Modules/FindBoost.cmake
++++ Modules/FindBoost.cmake
+@@ -953,6 +953,11 @@
+ set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
+ set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
+
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass.
++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi)
++ endif()
++
+ #
+ # Find RELEASE libraries
+ #
+@@ -962,6 +967,14 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_RELEASE_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
++ endif()
+ if(_boost_STATIC_RUNTIME_WORKAROUND)
+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
+ list(APPEND _boost_RELEASE_NAMES
+@@ -969,6 +982,13 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_RELEASE_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++ endif()
+ endif()
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
+@@ -994,6 +1014,15 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_DEBUG_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
++ endif()
+ if(_boost_STATIC_RUNTIME_WORKAROUND)
+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
+ list(APPEND _boost_DEBUG_NAMES
+@@ -1001,6 +1030,13 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_DEBUG_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++ endif()
+ endif()
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
new file mode 100644
index 0000000..6808b80
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
@@ -0,0 +1,44 @@
+diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake
+--- cmake-2.8.7.orig/Modules/FindLAPACK.cmake 2011-12-30 17:49:56.000000000 +0100
++++ cmake-2.8.7/Modules/FindLAPACK.cmake 2012-03-09 02:15:46.000000000 +0100
+@@ -1,3 +1,9 @@
++#
++# Version modified for Gentoo Linux
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
++
+ # - Find LAPACK library
+ # This module finds an installed fortran library that implements the LAPACK
+ # linear-algebra interface (see http://www.netlib.org/lapack/).
+@@ -36,6 +42,24 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PC_LAPACK lapack)
++if(PC_LAPACK_FOUND)
++ foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
++ if (NOT ${PC_LIB}_LIBRARY)
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
++ endif (NOT ${PC_LIB}_LIBRARY)
++ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
++ endforeach(PC_LIB)
++ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
++ mark_as_advanced(LAPACK_LIBRARIES)
++else(PC_LAPACK_FOUND)
++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
++
+ set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
+@@ -305,3 +329,5 @@
+ endif(BLA_F95)
+
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(PC_LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
new file mode 100644
index 0000000..c5e17c5
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
@@ -0,0 +1,18 @@
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index c47f583..5783d37 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -87,7 +87,12 @@
+ set(PKG_CONFIG_VERSION 1)
+ set(PKG_CONFIG_FOUND 0)
+
+-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
++if(NOT PKG_CONFIG_EXECUTABLE)
++ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG})
++ if(NOT PKG_CONFIG_EXECUTABLE)
++ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
++ endif(NOT PKG_CONFIG_EXECUTABLE)
++endif(NOT PKG_CONFIG_EXECUTABLE)
+ mark_as_advanced(PKG_CONFIG_EXECUTABLE)
+
+ if(PKG_CONFIG_EXECUTABLE)
diff --git a/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch
new file mode 100644
index 0000000..b9bf288
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch
@@ -0,0 +1,113 @@
+Set some proper paths to make cmake find our tools.
+Original patch by Heiko Przybyl, updated for cmake-2.8.8 by Chris Reffett
+
+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.8/Modules/Platform/Darwin.cmake
++++ cmake-2.8.8/Modules/Platform/Darwin.cmake
+@@ -229,20 +229,24 @@
+
+
+
+-# 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(_apps_paths)
+ FOREACH(_path
++ @GENTOO_PORTAGE_EPREFIX@Applications
++ @GENTOO_PORTAGE_EPREFIX@usr/bin
+ "~/Applications"
+ "/Applications"
+ "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+diff -ruN cmake-2.8.8.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.8/Modules/Platform/UnixPaths.cmake
+--- cmake-2.8.8/Modules/Platform/UnixPaths.cmake
++++ cmake-2.8.8/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,41 @@
+
+ # 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
+- /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
+- /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/libx32
++ @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/libx32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
++ @GENTOO_PORTAGE_EPREFIX@lib
++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
+- /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.8-pkgconfig.patch b/dev-util/cmake/files/cmake-2.8.8-pkgconfig.patch
new file mode 100644
index 0000000..e5eed4d
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.8-pkgconfig.patch
@@ -0,0 +1,62 @@
+From 3ea850a5023060b84dcc0e6f0098c32c28b15807 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Fri, 13 Apr 2012 08:50:49 +0200
+Subject: [PATCH] FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)
+
+The real fix is from Yury G. Kudryashov while I added the surrounding cleanups.
+An additional hint to really get this fixed came from Rex Dieter.
+---
+ Modules/FindPkgConfig.cmake | 8 ++++++--
+ Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 3 +--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 5d93ab1..39d3a76 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -13,11 +13,10 @@
+ # When the 'QUIET' argument is set, no status messages will be printed.
+ #
+ # It sets the following variables:
+-# PKG_CONFIG_FOUND ... true if pkg-config works on the system
++# PKG_CONFIG_FOUND ... if pkg-config executable was found
+ # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program
+ # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
+ # (since CMake 2.8.8)
+-# PKG_CONFIG_FOUND ... if pkg-config executable was found
+ #
+ # For the following variables two sets of values exist; first one is the
+ # common one and has the given PREFIX. The second set contains flags
+@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
+ REQUIRED_VARS PKG_CONFIG_EXECUTABLE
+ VERSION_VAR PKG_CONFIG_VERSION_STRING)
+
++# This is needed because the module name is "PkgConfig" but the name of
++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
++# handled by FPHSA.
++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
++
+ # Unsets the given variables
+ macro(_pkgconfig_unset var)
+ set(${var} "" CACHE INTERNAL "")
+diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+index 6604208..fc65e58 100644
+--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
++++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+@@ -71,7 +71,7 @@ endmacro(check_version_string)
+ # reported.
+
+ foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
+- JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB)
++ JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
+ check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
+ endforeach(VTEST)
+
+@@ -82,4 +82,3 @@ endforeach(VTEST)
+
+ check_version_string(PYTHONINTERP PYTHON_VERSION_STRING)
+ check_version_string(SUBVERSION Subversion_VERSION_SVN)
+-check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING)
+--
+1.7.0
+
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)
diff --git a/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
new file mode 100644
index 0000000..4e833ca
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
@@ -0,0 +1,133 @@
+From 3f5fa933d17e24cafd75ae28c00f4fc0292eae92 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Wed, 15 Aug 2012 14:42:16 +0200
+Subject: [PATCH] Set some proper paths to make cmake find our tools.
+
+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)
+
+Original patch by Heiko Przybyl.
+Updated by Chris Reffett (cmake-2.8.8)
+Update by Johannes Huber (cmake-2.8.9)
+---
+ Modules/Platform/Darwin.cmake | 12 +++++++----
+ Modules/Platform/UnixPaths.cmake | 43 +++++++++++++++++++-------------------
+ 2 files changed, 29 insertions(+), 26 deletions(-)
+
+diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
+index eff07b2..cbedc47 100644
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -228,24 +228,28 @@ SET(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK
+ "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
+
+
+-# default to searching for frameworks first
++# default to searching for frameworks last
+ IF(NOT DEFINED CMAKE_FIND_FRAMEWORK)
+- SET(CMAKE_FIND_FRAMEWORK FIRST)
++ SET(CMAKE_FIND_FRAMEWORK LAST)
+ ENDIF()
+ # 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
++# default to searching for application bundles last
+ IF(NOT DEFINED CMAKE_FIND_APPBUNDLE)
+- SET(CMAKE_FIND_APPBUNDLE FIRST)
++ SET(CMAKE_FIND_APPBUNDLE LAST)
+ ENDIF()
+ # set up the default search directories for application bundles
+ SET(_apps_paths)
+ FOREACH(_path
++ @GENTOO_PORTAGE_EPREFIX@Applications
++ @GENTOO_PORTAGE_EPREFIX@usr/bin
+ "~/Applications"
+ "/Applications"
+ "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
+index 5ee7ddb..961746d 100644
+--- a/Modules/Platform/UnixPaths.cmake
++++ b/Modules/Platform/UnixPaths.cmake
+@@ -33,6 +33,7 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+ # 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,41 @@ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+
+ # 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
+- /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
+- /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/libx32
++ @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
+- /lib /usr/lib /usr/lib32 /usr/lib64
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++ @GENTOO_PORTAGE_GCCLIBDIR@
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64
++ @GENTOO_PORTAGE_EPREFIX@usr/libx32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
++ @GENTOO_PORTAGE_EPREFIX@lib
++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
+ )
+
+ 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
+ )
+
+--
+1.7.9.7
+
diff --git a/dev-util/cmake/files/cmake-2.8.9-tests.patch b/dev-util/cmake/files/cmake-2.8.9-tests.patch
new file mode 100644
index 0000000..251a87f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.9-tests.patch
@@ -0,0 +1,81 @@
+Removes the following tests:
+
+- DeployQt4, which tries to break sandbox and ignores prefix
+- CTest.updatecvs, which fails to commit as root
+- TestUpload, which requires network access
+
+--- Tests/CMakeLists.txt
++++ 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()
+
+@@ -1582,30 +1565,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)
+@@ -1701,17 +1660,6 @@
+ FAIL_REGULAR_EXPRESSION "SegFault")
+
+ CONFIGURE_FILE(
+- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
+- @ONLY ESCAPE_QUOTES)
+- ADD_TEST(CTestTestUpload ${CMAKE_CTEST_COMMAND}
+- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
+- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
+- )
+- SET_TESTS_PROPERTIES(CTestTestUpload PROPERTIES
+- PASS_REGULAR_EXPRESSION "Upload\\.xml")
+-
+- CONFIGURE_FILE(
+ "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
+ "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake"
+ @ONLY ESCAPE_QUOTES)
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim
new file mode 100644
index 0000000..5cecd7d
--- /dev/null
+++ b/dev-util/cmake/files/cmake.vim
@@ -0,0 +1,3 @@
+autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim
+autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake
+autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake
diff --git a/dev-util/ndiff/ChangeLog b/dev-util/ndiff/ChangeLog
new file mode 100644
index 0000000..17a9585
--- /dev/null
+++ b/dev-util/ndiff/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for dev-util/ndiff
+
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*ndiff-2.00 (7 Dec 2011)
+
+ 07 Dec 2011; Marc van der Sluys <AstroFloyd@gmail.com> +ndiff-2.00.ebuild,
+ +metadata.xml:
+ Initial import
+
diff --git a/dev-util/ndiff/Manifest b/dev-util/ndiff/Manifest
new file mode 100644
index 0000000..d1bbd46
--- /dev/null
+++ b/dev-util/ndiff/Manifest
@@ -0,0 +1,4 @@
+DIST ndiff-2.00.tar.gz 230850 RMD160 e43154f80b988d0e50507bfc301e3ef09b806915 SHA1 b9ef2eb0de0cd26c3c92e0b3342d0ea4c37e8975 SHA256 f2bbd9a2c8ada7f4161b5e76ac5ebf9a2862cab099933167fe604b88f000ec2c
+EBUILD ndiff-2.00.ebuild 849 RMD160 e42f8661d04af3734985197deb42b0bfd5169236 SHA1 37ff08b16ca17c5232187697a39d13644f1ff034 SHA256 f5b3e0cdfee215dbe306f0db2e6ac390f459cc85afc683930d0b0306f2ecfbdd
+MISC ChangeLog 254 RMD160 051818a6ccd15066b3115dbb9be5b55dc5cb2a7c SHA1 e3111df7d486d8282fa95d1127f520585c816b65 SHA256 96e57d7764620f4dfedce6e36edcbec44f6212f0e089ea7108b8fc2b1f96b3aa
+MISC metadata.xml 258 RMD160 928fbdaa58fc02b10ffd96fc26322b4115978bdc SHA1 d159f126f8751fffb8a1fce67ff4c20d22183841 SHA256 078d1bb3cc9e6faf47ce4597e2552ca1892e79dedc65d849fc7f82682e5d03f0
diff --git a/dev-util/ndiff/metadata.xml b/dev-util/ndiff/metadata.xml
new file mode 100644
index 0000000..eeff77c
--- /dev/null
+++ b/dev-util/ndiff/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <maintainer>
+ <email>AstroFloyd@gmail.com</email>
+ <name>Marc van der Sluys</name>
+ </maintainer>
+</pkgmetadata>