Cleanup

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

8 files changed, 21 insertions, 505 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index ac2a021d0c70..154d29b6c3ba 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.176 2011/11/22 22:15:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.177 2011/11/22 22:18:20 dilfridge Exp $
+
+  22 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/cmake-2.8.5-FindBLAS.patch, -files/cmake-2.8.5-FindLAPACK.patch,
+  -cmake-2.8.6-r2.ebuild, -cmake-2.8.6-r3.ebuild,
+  -files/cmake-2.8.6-FindBLAS.patch, -files/cmake-2.8.6-FindLAPACK.patch:
+  Cleanup
 
 *cmake-2.8.6-r4 (22 Nov 2011)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index eb66b8f3c3a4..8cae898010c1 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -14,36 +14,30 @@ AUX cmake-2.8.4-FindBoost.patch 635 RMD160 4a665b76e4cf10ee67d5370527867882f9a39
 AUX cmake-2.8.4-FindPythonInterp.patch 543 RMD160 e71546dafa162726bce3f46994833a0d48ce9345 SHA1 cf61a9a45e5b6aece87453ff2c240f38ee0c8e0c SHA256 816a0c324abbb98ee342901715f7b07b31c2cdbede247a22178e13e5488264fc
 AUX cmake-2.8.4-FindPythonLibs.patch 642 RMD160 b116a8f6d4dfd722943a88b1998bfd194a014853 SHA1 f599c1e88a5a64a215e7d27cbfd097543b42e389 SHA256 5c9be7cad3446dc07ad75cc221a2de7df073fb35670ed5325516ef7db4b0c7a3
 AUX cmake-2.8.4-FindQt4.patch 10926 RMD160 15da9e13df5a98f9171a263c0c9d23f45707b494 SHA1 a7f1c589b115f6e5f9abfeb589cb07095510b1f4 SHA256 0aaa6b6a8fa4fdf3aea8efeaa831a3443e60a5a453cd7b71207e57980bce5564
-AUX cmake-2.8.5-FindBLAS.patch 1096 RMD160 632ad06a5b3fa645d5d29d46602151d941049fb2 SHA1 69e089cf3bb8c9f748c8118a6d6dcbc218adc4cc SHA256 39e0fe4aa61b1efd149151b44b2c84bc651e11e96dd29321bd7d87e76158ac77
-AUX cmake-2.8.5-FindLAPACK.patch 1170 RMD160 1ea32132a982d3cb03072855a21059c68392bdf4 SHA1 8cbc7da551885c43863decabafec3d4d095cadaf SHA256 570707887e4d45a656bfeecfc06f203c7676d05bba988776a8a259cfeefb14d8
 AUX cmake-2.8.6-CodeBlocks.patch 1171 RMD160 ca898b0b0664f74dde77bfea742463436753e6da SHA1 083c105f5af4e215d109ddf4f90c91b454c85dfc SHA256 b274e3d9c82f5f7ffb21c44234a3b42bb671b9b8ad3314b09baa329c18447458
 AUX cmake-2.8.6-FindBLAS-2.patch 1119 RMD160 e7b3976c2ef7c0358e9b1b90e567e4ef1d48bc64 SHA1 cab554930d495ca7baedd125ec637c36f511bcb0 SHA256 295999abe12fd8103bfccc22606ff2c730831f495c44d52d80dfe8952815874f
-AUX cmake-2.8.6-FindBLAS.patch 1064 RMD160 f359d84913dd868165f37d7bb9e507109552bf22 SHA1 1455e3602d9484a4fc339768eec221b037862ba1 SHA256 ef4b5e455ebf7431fdd4dd37a671c2c93b7e9db24cd13ac1eac9d3dccb1f828e
 AUX cmake-2.8.6-FindLAPACK-2.patch 1158 RMD160 2fb17c71e08e930ed9a71f59a4316c35749159b2 SHA1 6e4b552ea1d9a6a464089935a50ed1152b2323d1 SHA256 2caacc85c393d9ad09f2c92d0595480d1e02b8db6285aa35f270858075465425
-AUX cmake-2.8.6-FindLAPACK.patch 1150 RMD160 6f18fcb48dfa7ee92bd440198fcb2bc3822d3ad5 SHA1 9f9f92d7657025968ebfe74f5983c8b0ced94721 SHA256 033e3b0a217e0168b47588f01f2e4b216f0ade5dd0297264e8dc3f672a979caf
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.8.4.tar.gz 5477628 RMD160 8b92eb11391b07433e7fe02bbb80c3ebcaaf1893 SHA1 6c42699bd63fdfcc7743d4906e3208d051d7f19b SHA256 d97ea9f807f5407030d4f7246accc26addc520c9ee3897c4582eba3da49253cc
 DIST cmake-2.8.6.tar.gz 5583905 RMD160 c3095a4776367496f895b8075fda373568f01878 SHA1 7c2cbd42d27e26580cd4923892197b84b2a90675 SHA256 e6999b81ac367d85ffb0f69b6c4a0ef96f95dc154efd3592f9cfebacdf75728e
 EBUILD cmake-2.8.4-r1.ebuild 4510 RMD160 64efe5aa8c2b68908940ccf922d4754fc1a40d09 SHA1 0ef8f21873968242807661aa4ebb5617bb8e063b SHA256 b4aa824de85f7e74e6ec2c062d1ded1261fad04f3de7fbd0295faf32a6ebda5a
-EBUILD cmake-2.8.6-r2.ebuild 4727 RMD160 5c1b8e10376ce352f23c7e94e813007c5c6584f8 SHA1 3c50dc691446383f2f6f32e78c686918217f50c6 SHA256 67e1a2746ccbfb7becfa50f41c80d1d94fb12ef1ef900531490e92f2c995d825
-EBUILD cmake-2.8.6-r3.ebuild 4882 RMD160 859cbc81b2ced0fd472a76ac75d6057d495d889d SHA1 a9a39dd92c64a1391fe49a4f489efb88a30701db SHA256 3cca3a254278df1e97b5df2e53654017eddf84f2c705ab5c7901b315de418833
 EBUILD cmake-2.8.6-r4.ebuild 4884 RMD160 3b984ce337aba61b85b591c8b5ac4efcfb7a0454 SHA1 0a9176a405d66b873b445ae0c1031df56d37bf7c SHA256 2323def80c90f01db10a3462637dbb15ff95f1c73a2e8136a33fe3d6fd6fb0d3
-MISC ChangeLog 28272 RMD160 b38a51f96647d61bad3534c4e20ef3fa31cc5530 SHA1 3570e1645832d5f66e429eba0132c2fe8b90b690 SHA256 032f51cf922f5666b5b12021a8e2cefee970a89e0b09317c7a326c0dafcc6a18
+MISC ChangeLog 28538 RMD160 ebc253c864ef0c560b4dd8c935921b10b1949277 SHA1 b0fd489403ff3ff40be5506913d9eeec9abd101b SHA256 e65bbf6541b77609798239d8d411204d9c13dd01425841c401835c3480aadf00
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOzB8CAAoJENwGBM22xffes4cP/3bJAuy0gXNNPUEEk8rZqtBy
-L2X/npupCMBJHZ+P/QqQelP0UvAOR8XE7uLvEzwxVeFjmHXYHvDoAWGF/yDFG7ZB
-+1ZT+3974RgMTUZQ6dWTJKpgf8KnFeEm9tUZfYVtQQvXjQhZaWtwXdCWmWgKV0NQ
-Q41lsHcdv4q4jI5KE1F+VpJvc9uL6gTt416A42niUWKflv7g4rF1791TWqu7dIf8
-TErmRWlBCc8uC9Pn3HOjAkij5nX7wbNpU5yiyoutAnDjc16DOQbmU+Rylw/gmQUn
-x5GiCt052+4JuYBcVR7HsCBQRes+yVvzPAtvZIs09Y1r7X6bKvhrzIVDL8l4/To9
-j1CFeUaXAL5TG8ocoQBE1F98OgoJ2GAFypa3ZPiKRDg5ZSYNl/d+QE/XS4x+vP91
-/5eehIksl+HbMKGneWAc4q8wKuBPt/OJqSWyDkUT4bFWJ02p87dFNqXIUCMKO2ju
-wObbfJCddfOhcIrCINnSkGmcWQhxhT5vSXczMFdklsNNPRA9b8BnUQ8QNYkSi3RE
-Kmag2OJw9jIzsjFpfQQpfafUXN4h2ydu3BoSYth/OYHC4aSe3h3Uae0Xpzj5e2dW
-NxTNJTrpYRgYeXYmE0mRmspRohidPZmTx4irEdHoX3U85uM4j+5AuIQ1+NIsI3sS
-3sSNmFIWNWdvUA3OTbOP
-=rk4Y
+iQIcBAEBCgAGBQJOzB+yAAoJENwGBM22xffeLYMP/RTiGymW3PFae1RVf3dHOTCW
+LniLCop4q/Iwr99Ueb2Uj/KbK/L5ohaTm5mlaNdUqHKddy4b/LykSpbQJfPO7btu
+XoEP5fkkOf/jyZ5lgFHuZm/C0lXzCQUg1aXcfkdB3POmAfZMqBEaEk+qVQxokFwI
+APAaltWoyXvxXMWVMrX8ysVcnpEc98iXEVQ5+5rz8/xYwvMqHoGkEnF+XAeakocl
+IMo/T7YkkMu1lwfdAvK7Ck0/NjxCk/UmBHMifaouivsx7Va8mF/foYwK5/1QEOiK
+f2Q+j8wMTrHRLKWJ5SbJHxO9+r9ZFqeYthm1CqC/Y/SjV+VJ77tSs/DAL92/iQhX
+bGBkIJos7jsY+o9fohV/yMLJa9Mb3bB0TMOtmY06/6a0CAy4Y2QVzHOGT7FTrKB2
+hF/jM90/xV2BWeHyyymFxuYp4XvzkWxSb6XldRjcYIKrCdCUERxeK/t+/uVpOQOl
+rcXXmPLKnrqOP4cLWR7LrYdsaEep745iOBSizNp2rR1A4YSHfh+EXwOE3KIL6KZb
+qAtINVvEKw/ExpLyMSCBTVx+61FeGy4QQFG8mSPdwr1ztpFK93E4kZYsd920YcFx
+m7PrAO8IU6Y7mPvoQ4AFcKEEJXp++m97e28nZPMGdtYEc/XTHS0xjm8lspoKnqu6
+pQ3iY9+oCj+N90t6E2Ss
+=t0VM
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.6-r2.ebuild b/dev-util/cmake/cmake-2.8.6-r2.ebuild
deleted file mode 100644
index 8ac3a8e41659..000000000000
--- a/dev-util/cmake/cmake-2.8.6-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r2.ebuild,v 1.1 2011/10/29 21:49:29 dilfridge Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
-	>=app-arch/libarchive-2.8.0
-	>=net-misc/curl-7.20.0-r1[ssl]
-	>=dev-libs/expat-2.0.1
-	dev-util/pkgconfig
-	sys-libs/zlib
-	ncurses? ( sys-libs/ncurses )
-	qt4? ( x11-libs/qt-gui:4 )
-"
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-# Fixme:
-# Boost patchset is foobared and should respect eselect / slotting
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
-	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
-	"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
-	"${FILESDIR}"/${PN}-2.8.1-libform.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
-	"${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindBLAS.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.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
-	# 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 \
-		-E BootstrapTest SimpleCOnly_sdcc \
-		|| die "Tests failed"
-	popd > /dev/null
-}
-
-pkg_setup() {
-	einfo "Fixing java access violations ..."
-	# bug 387227
-	addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	cmake_src_bootstrap
-}
-
-src_configure() {
-	# make things work with gentoo java setup
-	# in case java-config cannot be run, the variable just becomes unset
-	# per bug #315229
-	export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		$(cmake-utils_use_build ncurses CursesDialog)
-		$(cmake-utils_use_build qt4 QtDialog)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use emacs; then
-		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins Docs/cmake-syntax.vim
-
-		insinto /usr/share/vim/vimfiles/indent
-		doins Docs/cmake-indent.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}/${VIMFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.8.6-r3.ebuild b/dev-util/cmake/cmake-2.8.6-r3.ebuild
deleted file mode 100644
index e1b84437d245..000000000000
--- a/dev-util/cmake/cmake-2.8.6-r3.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r3.ebuild,v 1.2 2011/11/22 22:15:19 dilfridge Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
-	>=app-arch/libarchive-2.8.0
-	>=net-misc/curl-7.20.0-r1[ssl]
-	>=dev-libs/expat-2.0.1
-	dev-util/pkgconfig
-	sys-libs/zlib
-	ncurses? ( sys-libs/ncurses )
-	qt4? ( x11-libs/qt-gui:4 )
-"
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-# Fixme:
-# Boost patchset is foobared and should respect eselect / slotting
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
-	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
-	"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
-	"${FILESDIR}"/${PN}-2.8.1-libform.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
-	"${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindBLAS.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch
-	"${FILESDIR}"/${PN}-2.8.6-CodeBlocks.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.5-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.5-FindBLAS.patch
deleted file mode 100644
index 2ffa2d2a3ec0..000000000000
--- a/dev-util/cmake/files/cmake-2.8.5-FindBLAS.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ruN cmake-2.8.5.orig/Modules/FindBLAS.cmake cmake-2.8.5/Modules/FindBLAS.cmake
---- cmake-2.8.5.orig/Modules/FindBLAS.cmake	2011-07-08 14:21:44.000000000 +0200
-+++ cmake-2.8.5/Modules/FindBLAS.cmake	2011-07-17 17:34:45.384557963 +0200
-@@ -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,14 @@
- # (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(BLAS blas)
-+if(NOT BLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
-+
- include(CheckFunctionExists)
- include(CheckFortranFunctionExists)
- 
-@@ -559,3 +573,6 @@
-     endif(BLAS_FOUND)
-   endif(NOT BLAS_FIND_QUIETLY)
- endif(BLA_F95)
-+
-+
-+endif(NOT BLAS_FOUND)
diff --git a/dev-util/cmake/files/cmake-2.8.5-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.5-FindLAPACK.patch
deleted file mode 100644
index 6a159a9a840a..000000000000
--- a/dev-util/cmake/files/cmake-2.8.5-FindLAPACK.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ruN cmake-2.8.5.orig/Modules/FindLAPACK.cmake cmake-2.8.5/Modules/FindLAPACK.cmake
---- cmake-2.8.5.orig/Modules/FindLAPACK.cmake	2011-07-08 14:21:44.000000000 +0200
-+++ cmake-2.8.5/Modules/FindLAPACK.cmake	2011-07-17 19:46:57.865560858 +0200
-@@ -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,14 @@
- # (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(LAPACK lapack)
-+if(NOT LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
-+
- get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
- if (NOT _LANGUAGES_ MATCHES Fortran)
- include(CheckFunctionExists)
-@@ -300,3 +314,5 @@
-   endif(LAPACK_FOUND)
-  endif(NOT LAPACK_FIND_QUIETLY)
- endif(BLA_F95)
-+
-+endif(NOT LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch
deleted file mode 100644
index 75b2814b9a0a..000000000000
--- a/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- cmake-2.8.6.orig/Modules/FindBLAS.cmake	2011-10-09 23:32:55.096356973 +0800
-+++ cmake-2.8.6/Modules/FindBLAS.cmake	2011-10-09 23:35:10.235667390 +0800
-@@ -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,14 @@
- # (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(BLAS blas)
-+if(NOT BLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
-+
- include(CheckFunctionExists)
- include(CheckFortranFunctionExists)
- 
-@@ -621,4 +635,6 @@
-   endif(NOT BLAS_FIND_QUIETLY)
- endif(BLA_F95)
- 
-+endif(NOT BLAS_FOUND)
-+
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch
deleted file mode 100644
index d1f3a96dac1f..000000000000
--- a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- cmake-2.8.6.orig/Modules/FindLAPACK.cmake	2011-10-09 23:38:48.956933106 +0800
-+++ cmake-2.8.6/Modules/FindLAPACK.cmake	2011-10-09 23:39:52.002144646 +0800
-@@ -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,14 @@
- # (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(LAPACK lapack)
-+if(NOT 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)
-@@ -304,4 +318,6 @@
-  endif(NOT LAPACK_FIND_QUIETLY)
- endif(BLA_F95)
- 
-+endif(NOT LAPACK_FOUND)
-+
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})