Remove old.

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

7 files changed, 15 insertions, 408 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 976430a2e8a1..cb4629acf13e 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,12 @@
 # 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.216 2012/09/09 17:34:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.217 2012/09/09 19:00:02 johu Exp $
+
+  09 Sep 2012; Johannes Huber <johu@gentoo.org> -cmake-2.8.7-r5.ebuild,
+  -files/cmake-2.8.3-more-no_host_paths.patch,
+  -files/cmake-2.8.4-FindBoost.patch, -files/cmake-2.8.4-FindPythonLibs.patch,
+  -files/cmake-2.8.7-FindOpenMP.patch:
+  Remove old.
 
   09 Sep 2012; Raúl Porcel <armin76@gentoo.org> cmake-2.8.8-r3.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #431520
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 7a1513e23b3f..09852468b5a8 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -7,31 +7,29 @@ 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.3-more-no_host_paths.patch 3052 SHA256 55165d67bad9def6b349bf67d02ede28a2fc291d28a2a5296897e25980ce623c SHA512 99eb1b0df254d290843e8f2ebd22a97b7e64784c33e82c5cdac28dbc97ebc6e2c66c39a5afe017af2877702cb5c390951a74a28aba26a6743fe38d466e9a91ed WHIRLPOOL b9409153464b9e954e8f0ec3061199ac4427145096155eae707774caf2908146c73401251d36a37121d3b7e9a9ebc46e7186581f656b3f4a364e9e5a38e5f35b
-AUX cmake-2.8.4-FindBoost.patch 635 SHA256 3c4d42b772b85e6838eaaecdb71ea345630fe519102d7c2f2234bcf8b9c63154 SHA512 4745469570c4a3d2bc969c743b5617e878058d2e0a4de2edf8d3e1c820e115a88d028256fca7e123d477c0c90b7e6a172ef398a3ba874a1376611d9dc5103580 WHIRLPOOL ddbcc8118dacc85e73422e34d247d16ab9809634f00d7271545b726a8cd9e2b2abc149c5e507f313b93865f0c5275752dc6e6e9053547e7a43570acb751b53ce
-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.7-FindOpenMP.patch 3265 SHA256 0bd38ba40fc6dcc1ab462c6e27e4f3a3dca6451881ba46c1ff87b1af3b200c40 SHA512 abbaba8af39bf22e972f32a9e0985e9efad49e773e8d282b2d52871dc092e17d98e0d11672a846fe03249196ec412f644070f6a530bf37dca91bc6f6cd342474 WHIRLPOOL 884d9f093b24d8856b0620d6a6a5f3fc022d9476da7362dfe2a890efb958a2f84e34d9ef943f0c9d5ee85fefb3851e2b63593b1dd33162db3e1e1bdd05cced94
 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.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
-DIST cmake-2.8.7.tar.gz 5667409 SHA256 130923053d8fe1a2ae032a3f09021f9024bf29d7a04ed10ae04647ff00ecf59f SHA512 2b48bd922a2fcd7569e610c823cbaa061178b112e045de2c97da5fd9591224ebb211e2e8688af0eb140d9762e87fa5e41d1324a80c57a933870a801914ba6431 WHIRLPOOL 2da491bf1c44eff57ca71c038e054a781d3cfdd7bd42219b26f18524e994019812c95c07c881734db57e8ce31f5af5d1df238e2f0c4676b559f9caa89db2f169
 DIST cmake-2.8.8.tar.gz 5691656 SHA256 2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46 SHA512 db31b1335c9964504a080a665c9e23010e081e973ba948b2d55a5adff76183271677c94830f2b604b06337df110eec29a8e8749795576c662c0b2f50fe69c882 WHIRLPOOL 2d0f388de643801cf2f389e9a84d218f09be28226e9b2e11d4a1f60222e3dfdd861b603f919b4b321c926612035944a4903ba4efd1d5397ae56068bfef40e6bd
 DIST cmake-2.8.9.tar.gz 5658837 SHA256 dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9 SHA512 d489fa1c720324d03d5fa6605ec5f39f99f98c2ba3f1754e9450fec35e4d9f9479638365ab813014fc648fe05096a519f387ee03f21b3b8b77088fde2857b6e0 WHIRLPOOL 69f0846b39b3e61f0f4774c702b74ed7445f67eeae8ae3e07f7d36c742966767eb9e39b2911c8e612ce0afdc4e24977f7afe2ebab3159d3096e1b2ba86b8247d
-EBUILD cmake-2.8.7-r5.ebuild 4913 SHA256 c4aa09162bf1ae121c66d2241c3c41ec721cceeb6b62585f9e4e45df07cfc8fc SHA512 65aff1283c36b40459c64c6f29be0b06de15b3b7b77cb5e2089c0c117b57c6be0310acc936b0bb5b25f2e1d93ab19775f362e8ea9980e88a8736ea021fb4ebd5 WHIRLPOOL 7cbbfa08604cff15d23906dd53ee81412cc39998ca95ab7b288e74ccafdfaaf199644f3d7491407f90d5db2319385c48ba1e9c0c5585a00d81906d221a980864
 EBUILD cmake-2.8.8-r3.ebuild 4922 SHA256 df38a6888ac0e788714a49664e54d634625deabd477eb7d8aa5c08c250d3ad8d SHA512 776cc706111f6df8e6cba1853834ab62983b467786bf15c4526ce228285c278a77b94d4f1e0c87cd1c44a7b022607cdd859df65c3a96962e787e62830de69a72 WHIRLPOOL d19c01a1827451175c131f276acc081e8cb6ea920c70bc3fb9fe4177601feb1c9db8770be4c5af50d869727cafc10571ff3af023bd266b32bf14c2af11bdb389
 EBUILD cmake-2.8.9.ebuild 4884 SHA256 b586b59a36a12d7a8dff3397b1a6a8cb1b9d1676d66efb9ff057792bf6b6e75a SHA512 8a86734272da6cd5759dfd6177178421d874f1dd9e0b2c447baa964c2fe87fb5cecd12d072e64f226569c6409ff9243c7c36c3247d25ffb21a8a1e59b47231a9 WHIRLPOOL a08cc5c9031918a298db5298a34ce19f419b5762cf322009de4feffe0cc8211cbedb79f5894ea557ec7f75a12445464076f3e4bc6346b9e8c813f09ef7578dbe
-MISC ChangeLog 34711 SHA256 1e839d39e0ad9fe297d9435ee820577d868cec64ea84b5de7597afbd4da33f64 SHA512 a4fd08346ebdf431cd74b3acb2165ffd5d754bfdb8d191bba58a2519b11b5aba19ce5163abe5edf4fa36fbb741b6004715a996e00a0e095104b52ffa1cc81c63 WHIRLPOOL 175a17d23a11a0c26d12a6df4d198f67e7a600d63d9c7c6e390295f7b621416aae0c931d0477dd1cf01a543d8e1572dda8d723333922a41969562fc18026844c
+MISC ChangeLog 34960 SHA256 5fc160454304670320597cf592c2c581f28c6c6623b9f1fee4bf8b0f1fe692d1 SHA512 56d694dc9cd6f1416009844a0f7e363155012393f6d9cdfaf0f750620e836bd75f2cc0541563f4efa09cb0ad307ded65c3f221633310088755f19e38ad931ae8 WHIRLPOOL 8a6bb8cc040f95ed1f21c5be785b31b719bdc562065764706440b94611a0aa8e9b2f5ad158e9bddf2e66f0f2a1dd79306d5b073728fe90c76e4c7240ca414a48
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBM0yYACgkQuQc30/atMkDLugCeIWsfqhlP0FvsM1NXw8xeKyBa
-z6UAnA8gN5H+lhwoYIcq0Pz6RFXcYaIz
-=kXMs
+iQEcBAEBCAAGBQJQTOc7AAoJEO+t9ga+3I3aFeUIANEgmucgHdp2UQsoHkPx38Xz
+oGCzydyvh7Wex+4K9bSmTTrC1eK6KhaXZ6hxXTRYlCBFMWv9UYMMCdIXnT8cXLUu
+BvxlQw6eQpzrjcYuDArYFQjPJt+apdMjd41Gzem9UO7i9rg1mowR2/ect4ghAZsR
+62l/gdAebN31mqB1atlEwQfrPmpI4koRNBBAGvvIjqasgkaweef5tCfhIzMlk8GS
+MdVzOMQwZoJbXQmcP1Qva8L+IoxQKunES6Hp5LWFdOfQWu4HteTAOOrnYIhDZCq2
+5k2Mu4sgNusYXTVaACVJuM5IsTUMkXpQC4sgoxXmsMxu/jEQn6UHROVh+JpeEak=
+=R6q1
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.7-r5.ebuild b/dev-util/cmake/cmake-2.8.7-r5.ebuild
deleted file mode 100644
index 72ff522e4fb9..000000000000
--- a/dev-util/cmake/cmake-2.8.7-r5.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.7-r5.ebuild,v 1.11 2012/07/08 18:16:13 armin76 Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
-	>=app-arch/libarchive-2.8.0
-	>=net-misc/curl-7.20.0-r1[ssl]
-	>=dev-libs/expat-2.0.1
-	virtual/pkgconfig
-	sys-libs/zlib
-	ncurses? ( sys-libs/ncurses )
-	qt4? ( x11-libs/qt-gui:4 )
-"
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-"
-
-# bug 390533
-RESTRICT="test"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-# Fixme:
-# Boost patchset is foobared and should respect eselect / slotting
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
-	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
-	"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
-	"${FILESDIR}"/${PN}-2.8.1-libform.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
-	"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-2.8.7-FindOpenMP.patch
-	"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
-	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
-)
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	tc-export CC CXX LD
-
-	./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir test
-	# this is altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
-
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
-	#        as it was never intended to be used this way.
-	"${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E BootstrapTest SimpleCOnly_sdcc \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-pkg_setup() {
-	einfo "Fixing java access violations ..."
-	# bug 387227
-	addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	cmake_src_bootstrap
-}
-
-src_configure() {
-	# make things work with gentoo java setup
-	# in case java-config cannot be run, the variable just becomes unset
-	# per bug #315229
-	export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		$(cmake-utils_use_build ncurses CursesDialog)
-		$(cmake-utils_use_build qt4 QtDialog)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use emacs; then
-		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins Docs/cmake-syntax.vim
-
-		insinto /usr/share/vim/vimfiles/indent
-		doins Docs/cmake-indent.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}/${VIMFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
deleted file mode 100644
index 38bad925c373..000000000000
--- a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
+++ /dev/null
@@ -1,109 +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.3/Modules/Platform/Darwin.cmake
-+++ cmake-2.8.3/Modules/Platform/Darwin.cmake
-@@ -217,19 +217,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)
-diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.3/Modules/Platform/UnixPaths.cmake
-+++ cmake-2.8.3/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
--  /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/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.4-FindBoost.patch b/dev-util/cmake/files/cmake-2.8.4-FindBoost.patch
deleted file mode 100644
index 4a56d43a9e5c..000000000000
--- a/dev-util/cmake/files/cmake-2.8.4-FindBoost.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN cmake-2.8.4.old//Modules/FindBoost.cmake cmake-2.8.4/Modules/FindBoost.cmake
---- cmake-2.8.4.old//Modules/FindBoost.cmake	2011-02-20 19:32:16.528655001 +0100
-+++ cmake-2.8.4/Modules/FindBoost.cmake	2011-02-20 20:28:41.572936744 +0100
-@@ -73,6 +73,9 @@
- # 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.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
deleted file mode 100644
index 28d2e4f87906..000000000000
--- a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-FindOpenMP.patch b/dev-util/cmake/files/cmake-2.8.7-FindOpenMP.patch
deleted file mode 100644
index 70e85d856cd2..000000000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindOpenMP.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-http://public.kitware.com/Bug/view.php?id=11910
---- Modules/FindOpenMP.cmake	2011-03-01 17:34:59.000000000 +0900
-+++ Modules/FindOpenMP.cmake	2011-03-01 17:35:26.000000000 +0900
-@@ -72,41 +72,53 @@
- endif(DEFINED OpenMP_C_FLAGS AND DEFINED OpenMP_CXX_FLAGS)
- 
- # check c compiler
--foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
--  set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
--  set(CMAKE_REQUIRED_FLAGS "${FLAG}")
--  unset(OpenMP_FLAG_DETECTED CACHE)
--  message(STATUS "Try OpenMP C flag = [${FLAG}]")
--  check_c_source_compiles("${OpenMP_CXX_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
--  set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
--  if(OpenMP_FLAG_DETECTED)
--    set(OpenMP_C_FLAGS_INTERNAL "${FLAG}")
--    break()
--  endif(OpenMP_FLAG_DETECTED) 
--endforeach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
-+IF (CMAKE_C_COMPILER)
-+  foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
-+    set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-+    set(CMAKE_REQUIRED_FLAGS "${FLAG}")
-+    unset(OpenMP_FLAG_DETECTED CACHE)
-+    message(STATUS "Try OpenMP C flag = [${FLAG}]")
-+    check_c_source_compiles("${OpenMP_C_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
-+    set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
-+    if(OpenMP_FLAG_DETECTED)
-+      set(OpenMP_C_FLAGS_INTERNAL "${FLAG}")
-+      break()
-+    endif(OpenMP_FLAG_DETECTED) 
-+  endforeach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
-+ENDIF (CMAKE_C_COMPILER)
- 
- # check cxx compiler
--foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
--  set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
--  set(CMAKE_REQUIRED_FLAGS "${FLAG}")
--  unset(OpenMP_FLAG_DETECTED CACHE)
--  message(STATUS "Try OpenMP CXX flag = [${FLAG}]")
--  check_cxx_source_compiles("${OpenMP_C_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
--  set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
--  if(OpenMP_FLAG_DETECTED)
--    set(OpenMP_CXX_FLAGS_INTERNAL "${FLAG}")
--    break()
--  endif(OpenMP_FLAG_DETECTED)
--endforeach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
-+IF (CMAKE_CXX_COMPILER)
-+  foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
-+    set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-+    set(CMAKE_REQUIRED_FLAGS "${FLAG}")
-+    unset(OpenMP_FLAG_DETECTED CACHE)
-+    message(STATUS "Try OpenMP CXX flag = [${FLAG}]")
-+    check_cxx_source_compiles("${OpenMP_CXX_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
-+    set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
-+    if(OpenMP_FLAG_DETECTED)
-+      set(OpenMP_CXX_FLAGS_INTERNAL "${FLAG}")
-+      break()
-+    endif(OpenMP_FLAG_DETECTED)
-+  endforeach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
-+ENDIF (CMAKE_CXX_COMPILER)
- 
- set(OpenMP_C_FLAGS "${OpenMP_C_FLAGS_INTERNAL}"
-   CACHE STRING "C compiler flags for OpenMP parallization")
- 
- set(OpenMP_CXX_FLAGS "${OpenMP_CXX_FLAGS_INTERNAL}"
-   CACHE STRING "C++ compiler flags for OpenMP parallization")
-+
- # handle the standard arguments for find_package
--find_package_handle_standard_args(OpenMP DEFAULT_MSG 
--  OpenMP_C_FLAGS OpenMP_CXX_FLAGS )
-+IF (CMAKE_C_COMPILER)
-+  find_package_handle_standard_args(OpenMP DEFAULT_MSG 
-+    OpenMP_C_FLAGS )
-+ENDIF (CMAKE_C_COMPILER)
-+
-+IF (CMAKE_CXX_COMPILER)
-+  find_package_handle_standard_args(OpenMP DEFAULT_MSG 
-+    OpenMP_CXX_FLAGS )
-+ENDIF (CMAKE_CXX_COMPILER)
- 
- mark_as_advanced(
-   OpenMP_C_FLAGS