Version bump, remove old.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

9 files changed, 315 insertions, 63 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 03a19496eaa6..c2af395bd833 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,16 @@
 # 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.226 2012/10/02 10:23:44 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.227 2012/11/18 13:40:15 kensington Exp $
+
+*cmake-2.8.10.1 (18 Nov 2012)
+
+  18 Nov 2012; Michael Palimaka <kensington@gentoo.org> +cmake-2.8.10.1.ebuild,
+  +files/cmake-2.8.10-FindPythonLibs.patch,
+  +files/cmake-2.8.10-darwin-bundle.patch, +files/cmake-2.8.10-desktop.patch,
+  +files/cmake-2.8.10-libform.patch,
+  +files/cmake-2.8.10-more-no_host_paths.patch, +files/cmake-2.8.10-tests.patch,
+  -cmake-2.8.9-r1.ebuild, -files/cmake-2.8.9-tests.patch:
+  Version bump, remove old.
 
 *cmake-2.8.9-r1 (02 Oct 2012)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 190c1a8736fa..ba54622be10f 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -7,6 +7,12 @@ AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 SHA256 e403b204b3f64e5fb01af631
 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.10-FindPythonLibs.patch 559 SHA256 0080885e637df2a0326cd33582d85842b7f274d345998a0df143045af76f23e9 SHA512 3b891029b0d4aa65990eae0143cd8727d07e5e07491e9d275ee96ae21614e8d3fbcc03e22a6ca5b503aa7de53bca01b8a909d6a769279ec3059a379912e139be WHIRLPOOL 04680f4fc18c719209bc7f6ce721f29d8f945dc3ca3eb2e2ae3fce0c3af062f425533e3151caa0c48e9af9a8e0cfcf3399eac5b6eb6cf02ee3efaed2fc7d06d3
+AUX cmake-2.8.10-darwin-bundle.patch 956 SHA256 8195342561ada36d4e3796a906fc662f9f84cc470809e7596b4376f3fe90dbac SHA512 39f444f592f435fbcc865a903ccb851b6c40ddf5f3b99b986c92af6b8984978d4fa1819808f1365f53887098da8533c31f6ea29e14cb541045ed3f63fcc771e2 WHIRLPOOL c20412508cad6329bebfb152051008c5ff98f0a27657d047992f4523a213d4ee396ea23c009ad2133b283ab4518d359b2b65d5034e06bd5649a6f08d76cb5db8
+AUX cmake-2.8.10-desktop.patch 370 SHA256 747eb8c75f82d1edf9683c31914892e19118670d4e2e955cdcf5a14f25fefe15 SHA512 bc5c6ca27e3317ac7c65e09733331e3732ea31c28d5b08b7fbd150845cf6657238b017d0782237ef57abab9fec249cacf78762dfe66c6389bc0fd9a91add0f08 WHIRLPOOL 5c446ba04f0d88a022a415c03e601ee6dc7cbfaebe8c564f9e5ca88a92e9f5755ae8435789e477ff14980a22e690748c7b0bc602e51bc8a074fb025010337dbf
+AUX cmake-2.8.10-libform.patch 1598 SHA256 8635248bfebe157e545eddc3c16223e4d8c51af51a8d224ef1003a043ce468f4 SHA512 08a0fb45f2b4c1a8ba0e961539d650e38feedd4b2ca3b5acc2fcad3d68fe3fcdb5b114663b1f84b26027e902d28cc2d4f50cc1e3491ba90d6c3c273aa32d62d9 WHIRLPOOL 505231f51be487dd71eb2f17cb65560eb86039673a593e1e76f3d7f27c3cb64dad36ef1c507aa9e97aae28b20f642dfcb4d023537e0a1af361e74c43b88a51e1
+AUX cmake-2.8.10-more-no_host_paths.patch 4221 SHA256 adf64e6357c69d6153efcf0bab708e209071237e29b7f04f80dc7708726a8034 SHA512 c08340d0cf5c4d931fa3a608fafd0eb950cc7f2f9bed2bc152c973f27a2b1c880f13bfbc55698534d533b62f5ed1a03347980d07bad2abae8379f7d2e630e6ee WHIRLPOOL a259a4c8fd271d704c0a6135352f4fdeed9a9aa50077aa1a520889b8a636366c9c9b8632808e54740f9eb7413ab8e0a453a1262b9224839486176690774ac696
+AUX cmake-2.8.10-tests.patch 3339 SHA256 189bd592d5c7de8f9146858b031cf270b4c7385c02ca7dd7e9e86b87e7a7a62e SHA512 3bda453b07f80aeaafd866495a370895497ee2e11707e08994c5636de451f3d114d26c37e1994058cca87be01fa2f684bd3463f6676b6e1b4d5bb5858d6ee340 WHIRLPOOL 1c0631fecb3539a5e2e63e591a947b7de4e0961e2a43c25e2ee380b7335750ea84eaf84e854e59bfe17c345202cae60983e2dd2b8ad3df80cef83e785160101f
 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
@@ -14,21 +20,21 @@ AUX cmake-2.8.7-FindLAPACK.patch 1744 SHA256 5dbbeaf0532fbdbd24f94175f24c26567d1
 AUX cmake-2.8.8-FindPkgConfig.patch 658 SHA256 3261fce9682f476f121aa3d30126e4f8d866b138c887c19d6f47b60df3de9cbe SHA512 b52986a9faf2329096452c3cf4b3066c2eb51b37d057bf46527dc7797fcd795936d63ad287419c2eba6ffcb0134b24544d62fb5c449e6a25354b65a4d5c63d8f WHIRLPOOL b444f6524b1e24d0c1040508babc03b229e7bac7ba11c978d155252fc8df9d052f7f23010c0db027af9f41e594d6ca131e6018f58a21d83f797762ddf644b911
 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.10.1.tar.gz 5767574 SHA256 dbfb9d609e8fdb6f0947993246c11e2ee5d47944d6e7bd9314463b31e420e6e0 SHA512 115176ffebbb16d09dc19ae9e032bdbb3cb61471f2931b5a25106a59ae76a1334359f8187a7d17ee6a4ae4ec28277089db9e94659afebb5dca05fa64a08ac5c7 WHIRLPOOL 298de61a62a359abd59c5b5d59c776c6d2504ab592aed0bcda7d153bc2656d8bd130d83b1f4f2aa2189efddd66d93c5fccff53053c2248fa04086c82966ecd9d
 DIST cmake-2.8.9.tar.gz 5658837 SHA256 dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9 SHA512 d489fa1c720324d03d5fa6605ec5f39f99f98c2ba3f1754e9450fec35e4d9f9479638365ab813014fc648fe05096a519f387ee03f21b3b8b77088fde2857b6e0 WHIRLPOOL 69f0846b39b3e61f0f4774c702b74ed7445f67eeae8ae3e07f7d36c742966767eb9e39b2911c8e612ce0afdc4e24977f7afe2ebab3159d3096e1b2ba86b8247d
-EBUILD cmake-2.8.9-r1.ebuild 4893 SHA256 ab7a67610900b1d09daccd7747597fdaae274ae460ea0aaee8b7d814b8e039d5 SHA512 884aeaf5ac5179212339b5eef5982b9039dc98e2a7f028f26b12cf76bf1cbeb504490c395053de8b88dabc1ac72df15c6509b6be75cc129a48156fdfdc053d69 WHIRLPOOL 6c69d4b1d0070fcb8c8cbc0679e2434850353d66235dfab68c21779eb6941308bc2bbd232bde38db8e12d6fc6ef67b75b3d3ecb97a10fed18c00978fda8712d8
+EBUILD cmake-2.8.10.1.ebuild 4901 SHA256 1643608572a04911cfe928405404ad41e094dd9d5b7a1f97e8922923b4975746 SHA512 7734f8681fd900a85df9c5df070fb820c573583f3347757ab9a429ebde3fe1d2fe13515fc82cc1dff8a88e238e64d3784cd876c24ec22b035bae5c7a4dba59ed WHIRLPOOL 0a7ae9b82c762b8550579a7a8ed44b7688a3ccf5a28095bd639e37ec3265d3c14eff09eab6f4629887c03ce84fb8546b12cbe02333b2737445eabf50df09ede1
 EBUILD cmake-2.8.9.ebuild 4876 SHA256 afd5b890bf972c42947d29d8bcb7e8a91818074352e35a5e3572b74acbca31b7 SHA512 0f804d45fb8cb957d2e199a53960b1866f578d473b29cca5a8c98b5201f0f1b510bda1de350c7b5e3ebeb563ce238454ba2d08c111d3cea7e9c9315618ae75b7 WHIRLPOOL 28c6fb434fd6586596288c485c9e34ae43a646a990e8cab3c0eb042e11648d7e372cf35494e2501d24c1eab631b36f25c3c0229d0138db39015007911d4174f7
-MISC ChangeLog 36151 SHA256 d41263c5cc0086916a80b42b3fb4b2c54d995e3af879f4924e67a439c1fe97ae SHA512 d208b681c51d883414e94f813ba216c6adbaf98fc9f7f0b064a1cb5450821704430c07f277b801f740a56180263479d6fe14b13a1235e089a2783258a1ae75e5 WHIRLPOOL 99d5a711f11e54d5b3944eaf0be4cb85b7fc3e503e5e30980c5afe6a218148302fe39270499b2f32b519ac538e7cafc46cc22391cca1d4adf716fa7c94263da1
+MISC ChangeLog 36589 SHA256 6513ea7e8bc4b8cbfc1d153ed641825f21e2aaf0f7a6140d11b3527d6eb1b591 SHA512 733993981235e7929c972876138deaf5d8e2c61cab5314d633ff0a7393145e78cb0042ccc951e3106c198ba4308c0269757c5872a4e5ef4d4419098134f02564 WHIRLPOOL dfe9a53ccc323aca349b47a856b5df89e1f12a98739982c10dc28edc03327b585fa11db11377a4b7164a5e246e575ee494c227157c6edee4269508cb311b02ae
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQasBvAAoJEMbwO6tnXQ0sSHAIAMGe28/nDYhgawjpLKcrbrCC
-KCKEteyjzWWL2nvq5rLCQod3kzgnLQbmLWD8UMcWFZOAeSmGd/qwHdHpRFCH55h7
-L3JuVT+bHGQLda0B3w/QitwAq5o+pN9RZC6OOTxUFZGfcjEHZ56vqsjo/kL+ueSm
-ftT7nspVSy9ot/b3qXwBGec8PLAxnRjjTDC0UgYsVC0l4FYE7x6xpKqZtVxjFHvU
-Ke7q5cK50mnhSSmenMJR3cllFy/TWXo0WJy1STjItqf3HQeqUbnPRlOgTm9T4e0q
-MhoPDWGBO/x2ag8MfXu8Rw8ep6r5gKFlb1PytRHT6G2ccMYcOQrydHA/2uOuA6w=
-=V9Z+
+iQEcBAEBCAAGBQJQqOTbAAoJEMbwO6tnXQ0sazIIAMTJTcSSte0kt89hINiPWiK5
+7UKr4n/bDaz7sLBo1Nd5GVCsZ+mK1agJyABqi+QgFZU+c9W/rDQkfQKPVb/pShb5
+95iW61HIa3XePPN3v+GsYodwdanpXquz3ohLdyzOy6Ps/zeo0Ecs9GIG/94VVyK2
+Z1hW7IFUlE5/2emjuAh57vrFyWYuk7MKZkaLILO7fsdwoQTI/nieOId8rOQhurQy
+6rjG081kxWEv7rgW+VpRMBF9vVUaqrOhZz2cdfDT5wriweyqHhMqv1F4WJ96eQ+3
+HFOr1IWfKy2DW4UN7f/a9nXDPD3EMy7QAv7CfvtFCd5heTb3rxl4ZKlh8Y81hBo=
+=/1Kx
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.9-r1.ebuild b/dev-util/cmake/cmake-2.8.10.1.ebuild
index d69e77d20e99..af81823d2809 100644
--- a/dev-util/cmake/cmake-2.8.9-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.10.1.ebuild
@@ -1,17 +1,15 @@
 # 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.9-r1.ebuild,v 1.1 2012/10/02 10:23:44 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.1.ebuild,v 1.1 2012/11/18 13:40:15 kensington 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"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${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"
@@ -20,12 +18,15 @@ 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
+	>=net-misc/curl-7.20.0-r1[ssl]
 	sys-libs/zlib
+	virtual/pkgconfig
 	ncurses? ( sys-libs/ncurses )
-	qt4? ( x11-libs/qt-gui:4 )
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+	)
 "
 RDEPEND="${DEPEND}
 	emacs? ( virtual/emacs )
@@ -40,23 +41,21 @@ RDEPEND="${DEPEND}
 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-fix_broken_lfs_on_aix.patch
 	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.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-FindBLAS.patch
 	"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
 	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
 	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
-	"${FILESDIR}"/${PN}-2.8.9-tests.patch
-	"${FILESDIR}"/${PN}-2.8.9-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.8.10-desktop.patch
+	"${FILESDIR}"/${PN}-2.8.10-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.10-libform.patch
+	"${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
 )
 
 cmake_src_bootstrap() {
@@ -91,10 +90,11 @@ cmake_src_test() {
 
 	# 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.
+	#    CTest.updatecvs, which fails to commit as root
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
 	"${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E BootstrapTest SimpleCOnly_sdcc \
+		-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
 		|| die "Tests failed"
 
 	popd > /dev/null
diff --git a/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
new file mode 100644
index 000000000000..d4f18ff50f80
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
@@ -0,0 +1,13 @@
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index 0a9a990..6a13d22 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -79,6 +79,8 @@ unset(_PYTHON1_VERSIONS)
+ unset(_PYTHON2_VERSIONS)
+ unset(_PYTHON3_VERSIONS)
+ 
++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.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
new file mode 100644
index 000000000000..9cb4777cc9ba
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-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
+@@ -26,7 +26,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 "")
+ 
+@@ -48,7 +48,7 @@
+ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-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.8.10-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch
new file mode 100644
index 000000000000..e0cefa9ceaf0
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-desktop.patch
@@ -0,0 +1,13 @@
+diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop
+index 645eb76..7be495f 100644
+--- a/Source/QtDialog/CMake.desktop
++++ b/Source/QtDialog/CMake.desktop
+@@ -3,7 +3,7 @@ Version=1.0
+ Name=CMake
+ Comment=Cross-platform buildsystem
+ Exec=cmake-gui %f
+-Icon=CMakeSetup32.png
++Icon=CMakeSetup32
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch
new file mode 100644
index 000000000000..052cc30699fd
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-libform.patch
@@ -0,0 +1,51 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea1c033..ae479ce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
+   else ()
+     set(BUILD_CursesDialog 0)
+   endif ()
+-  if(BUILD_CursesDialog)
+-    add_subdirectory(Source/CursesDialog/form)
+-  endif()
+ endmacro ()
+ 
+ #-----------------------------------------------------------------------
+diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
+index 96e28b4..4102379 100644
+--- a/Source/CursesDialog/CMakeLists.txt
++++ b/Source/CursesDialog/CMakeLists.txt
+@@ -25,13 +25,16 @@ set( CURSES_SRCS
+               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 --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
+index b157a28..f131ea4 100644
+--- a/Source/CursesDialog/cmCursesStandardIncludes.h
++++ b/Source/CursesDialog/cmCursesStandardIncludes.h
+@@ -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.10-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch
new file mode 100644
index 000000000000..88927a3238b9
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch
@@ -0,0 +1,134 @@
+From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Tue, 6 Nov 2012 23:35:34 +1100
+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)
+Updated by Johannes Huber (cmake-2.8.9)
+Updated by Michael Palimaka (cmake-2.8.10)
+---
+ 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 a401762..775e547 100644
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -251,24 +251,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 ccb2663..0501d53 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.8.0
+
diff --git a/dev-util/cmake/files/cmake-2.8.9-tests.patch b/dev-util/cmake/files/cmake-2.8.10-tests.patch
index 251a87fa9804..944e3c56a782 100644
--- a/dev-util/cmake/files/cmake-2.8.9-tests.patch
+++ b/dev-util/cmake/files/cmake-2.8.10-tests.patch
@@ -4,16 +4,18 @@ Removes the following tests:
 - CTest.updatecvs, which fails to commit as root
 - TestUpload, which requires network access
 
---- Tests/CMakeLists.txt
-+++ Tests/CMakeLists.txt
-@@ -273,23 +273,6 @@
+diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
+index b404333..50f4292 100644
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -271,23 +271,6 @@ if(BUILD_TESTING)
        )
-     LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
+     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}
+-      add_test(Qt4Deploy ${CMAKE_CTEST_COMMAND}
 -        --build-and-test
 -        "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
 -        "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
@@ -24,58 +26,58 @@ Removes the following tests:
 -        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
 -        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
 -        )
--      LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
+-      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)
+@@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
+       list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
+     endif()
  
 -    # 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"
+-    if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+-      find_package(CVS QUIET)
+-    else()
+-      find_program(CVS_EXECUTABLE NAMES cvs)
+-      set(CVS_FOUND ${CVS_EXECUTABLE})
+-    endif()
+-    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()
+-    endif()
+-    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}
+-      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)
+-      list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
+-    endif()
 -
      # Test CTest Update with BZR
-     FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
-     MARK_AS_ADVANCED(BZR_EXECUTABLE)
-@@ -1701,17 +1660,6 @@
+     find_program(BZR_EXECUTABLE NAMES bzr)
+     mark_as_advanced(BZR_EXECUTABLE)
+@@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
      FAIL_REGULAR_EXPRESSION "SegFault")
  
-   CONFIGURE_FILE(
+   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}
+-  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
+-  set_tests_properties(CTestTestUpload PROPERTIES
 -    PASS_REGULAR_EXPRESSION "Upload\\.xml")
 -
--  CONFIGURE_FILE(
+-  configure_file(
      "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
      "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake"
      @ONLY ESCAPE_QUOTES)