Revision bump to fix detection of python (bug #405181) and newer imagemagic (bug #465898).

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

6 files changed, 282 insertions, 17 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index c073549d2e3a..b21c29068826 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.232 2013/03/02 20:20:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.233 2013/04/14 17:41:44 kensington Exp $
+
+*cmake-2.8.10.2-r2 (14 Apr 2013)
+
+  14 Apr 2013; Michael Palimaka <kensington@gentoo.org>
+  +cmake-2.8.10.2-r2.ebuild, +files/cmake-2.8.10.2-FindImageMagick.patch,
+  +files/cmake-2.8.10.2-FindPythonInterp.patch,
+  +files/cmake-2.8.10.2-FindPythonLibs.patch:
+  Revision bump to fix detection of python (bug #405181) and newer imagemagic
+  (bug #465898).
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> cmake-2.8.10.2-r1.ebuild,
   cmake-2.8.9.ebuild:
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 72a7c1c9a9ee..52b1cb7faa37 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -13,6 +13,9 @@ AUX cmake-2.8.10-desktop.patch 370 SHA256 747eb8c75f82d1edf9683c31914892e1911867
 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.10.2-FindImageMagick.patch 2834 SHA256 c4aefe4c7d962a37da700ee505516d4d056517cc46e95aac994b8272e2cc5487 SHA512 2c4734462b847d7caa8d073cdb51c5f00d7b7c1a70abc5977252ddd74b27dcb8c4a89414c02a23626029f9e79a4210a3a6d59135a7f074c41df9c1eba8bdfcfb WHIRLPOOL e430ec0f104029b42bdfd6636666742e3facac233d1395f82b979722a9a7caf324756a1405fa43b1d14dc96f96a579a8a3e9fa751398cfdff64269983afd69ed
+AUX cmake-2.8.10.2-FindPythonInterp.patch 651 SHA256 bae58e84982de8331a4038fdc1339baa42512ffb254dfbf553d3bf6f04221cfe SHA512 a1c68cc9f24addc771b8eb33ca6ac0d841311b634e5c5d6500924d70678408a666353791a8b2a00013e1b31545ecef6d26f939216b8fe7dcb8b6152c9e89f17c WHIRLPOOL 3c6a3f084d402244d8628bce6ac17a11eda0d55ced3824584284f63b5f1300f89921941257ded395e2aec88950ab65ca80dd9ff0fa6932f7eee908bd4778c688
+AUX cmake-2.8.10.2-FindPythonLibs.patch 992 SHA256 84053943d3d99426ed4262d542b87f03dc0e8aaefdefd8d8f95bb7e758d06635 SHA512 b3f1613fd9738fcc8d445c3c3249fdbb224999fdfd4892d5eeac94816300803a14deabc3bb3bb1f47ee8eccc3b669012924ad68ebb26885e2dfe61e997869411 WHIRLPOOL 12752e4f3e745ef1d475e78b7bbe8c0133b092c6b03719dc8e5783868f3faa9d19aada7fd20fa61105ca8ead4289760916fe023015f0802c61b21f53fe5a9544
 AUX cmake-2.8.10.2-implicit-include.patch 5674 SHA256 25839c6c1726e1eaf65e7fc127a23075d89d304f53ceafaa3c2ac36763ed9488 SHA512 0b8ee9fad6ded237c97667cc4eed4347e287ddf899ed3d0f400a434b988d44509a002fdf7b1efc6e92826476d483766bd8a5b444e8daadc836d3b96c2bfdbce5 WHIRLPOOL 370c375395d477fb537fb8f0db76bd846e375d841dcb4f6be1b5c0bf7026cbc0c6f5a82bb786a6f97819da8c15b060c77ca89bfc0a64f811d65ca04f87f6344e
 AUX cmake-2.8.10.2-qt5.patch 423 SHA256 56caffa73e509b28c7a950fd1346e590751ab9b0e134ec203281ebc5a4481fcd SHA512 f1ec48c01b1747f169fbc835cb25830d2cdc92769397e4fc00fe816b2eb8954d7d0bb77f6114341343ece4b208db83e6b95174b935d788e39de97cfab679ffd2 WHIRLPOOL c544b33913d6e481cd741e0bdeca0e3fcfb682b58ab3b0d4cca59bda08db1c8da0ee66726fc7b589620a8d0d5ccbc1fafb221dfc552ac88fecac6f9219a80fd6
 AUX cmake-2.8.4-FindPythonLibs.patch 642 SHA256 5c9be7cad3446dc07ad75cc221a2de7df073fb35670ed5325516ef7db4b0c7a3 SHA512 5baa7080e920cf835fcb9defa1298ebb7fde87eb322d6eacde79ae344870a97a4f7d58d307da77c1f4d2beffc1c76058aaa7189b3f4fdd79c6270f6d3f387065 WHIRLPOOL a289a2e82976d7aa3ef2f86aeb394c46df391780d751d2f463ef816a9cf0b7c723cdab32d120ffd90be38daeb4b4baef00cb8597c3e9f9c98a36e6d57ae6b5be
@@ -26,25 +29,18 @@ AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7
 DIST cmake-2.8.10.2.tar.gz 5768373 SHA256 ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1 SHA512 e79759f4429977bb4292c9dc8a9d216ca7c21dca5fefce1fa223d7847a1128c8a3a11e1b6adaac40b2f30e0d6f504508a2845f888a319acc29c2ef6beff55df2 WHIRLPOOL f7327282d352ec04afb6349abc74aa3205ceb57efcb013650f18025e36010a27ca28725cd06e29e7bc5ff3196a4c8abeafcb733fba9c6bcc02159a5c6b8e90eb
 DIST cmake-2.8.9.tar.gz 5658837 SHA256 dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9 SHA512 d489fa1c720324d03d5fa6605ec5f39f99f98c2ba3f1754e9450fec35e4d9f9479638365ab813014fc648fe05096a519f387ee03f21b3b8b77088fde2857b6e0 WHIRLPOOL 69f0846b39b3e61f0f4774c702b74ed7445f67eeae8ae3e07f7d36c742966767eb9e39b2911c8e612ce0afdc4e24977f7afe2ebab3159d3096e1b2ba86b8247d
 EBUILD cmake-2.8.10.2-r1.ebuild 5011 SHA256 1319bcb3fe5db958b5c03c69e30b2936bd2f35e932156debb7b83e8e1811724b SHA512 9065e136f2b6faf0c876bc2ad0601918ec2a5585de60bd2baad2a53e29f3bb800728af669e84e46a3a126079d891b279234836f7291908e325795c953d253958 WHIRLPOOL 18ab26f800d38ab2f071a7ffe5aca1d1b64e1f32dcbd2c312ff18fafec4cf39a3742a27cfe51273d396c66eae9b9764dc6dc596606d2b1b18c5c94b601b38c47
+EBUILD cmake-2.8.10.2-r2.ebuild 5029 SHA256 4d033b5a13eca24fe41a895435b93cca106aaa9da12aa570be71d158513bc435 SHA512 7324e8ed9caf5d4997a600cca0ada8b00c3ff743d9e9bbda8d7c8efa4e60ab0e7004c8904323e7a6f491abf8877e9e54d15095c55e23a59c404b5f381ce16335 WHIRLPOOL 6173740bffa8819e53371fc354b77097dc3f6098531ccc67a545b64867d5ed34ea86358ef8433d56119c90b628ceb58fc9437dfb5884c2086caf20a17afb2915
 EBUILD cmake-2.8.9.ebuild 4874 SHA256 0b541568e9aee2bb3e90bf146a9580465756d98cb2621b18b9ede47416ed4f13 SHA512 f8081821248816358cb78026d7766fd08d45e8e294e00033dfb8e08aaca027b21f9325d7c21895852ad5933a1ce2e09c8f17ea5c3c7568a6b51e690fb1697356 WHIRLPOOL de0726f1d2d09cc19042066e5a6216da9cd0811d02bb081dd688783b2e2bb6f945779b92d44cc205f94f5710fd3f5e9eda3f436386ec90f534e3ed0512a08749
-MISC ChangeLog 37545 SHA256 5a35065418dd26827794c704c1504026839df620d2a7d150184bd2cb86013881 SHA512 b91386756c25e71a38e7dae636b21bbeff8103791cc3f13909d816fcb0753c202cf960d8d5a3b3becbeb314595d00c1aaeb5cc2075a7a2ec38e5afd5346ec5da WHIRLPOOL 76ac11efe0415a2f35efe8cc604f6dcc3b8d48885d1eac704e0b236bd9f5d1d9019368b5b0279896f65407e143c7deaf19d9cc300031d4c426d42b1ef5ca32c9
+MISC ChangeLog 37901 SHA256 aaf220d079340e5a8fbc904d02d5277f29140255c04a5011f9a8fcf4dc8bfa28 SHA512 8894637919415d4a615404cf30ae6acc559632abc13f50762a83c7018bea155e0a68a40624b961237b06cfeab8e1e17eb7f92c2d9ee2ee394c40d367c791fe4c WHIRLPOOL e0755aeea8057eb63e8ffb7fa8f4330d171b02d929c9bd53866e40b52133b670cc28f379fa68a03c89d0408a13ef662ca1f059e4a7d9d3a92e4630f024f7ec35
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMl8rXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun886OgP/R7NrbboFF/KTiYqwssK01tu
-o/MzJm0FMVuwy4nSE+60Lcff7zq+vOSFDMPYP194qYuXoKL/vidsNc2PWMoKhYiK
-/udkvWbpMw3W2X6DI3bMkTvbmhB+E1Q3qUeBI3p8fnP4buyFi9RvwRSasIy+qrwL
-gemCVlxO+HsS+ZwhFqV0UHsRcTsCIsOjfBdDya6U9c1tfJY7j3z3ayK4HWdZZYhY
-/g+8Vabd7DFghc9iqN5AfV0aVOuQmJxPxFGGqFRdhRWL62O9GtV82gHAFCyqECiy
-Y74DoBikCGDU2rZuH97+PuVCjMos9W2HerK/wo5ynqpduLXLHcbttHe/2AdHIp79
-qRIX8ySMZMgwsZkMpQft+qiSZ6ezsxyOPZVc7da7EBRSVCY+SVpSI1yXrY8xIoXp
-qiysrVKOfTnpY3IJQiISnhzryGMq6AxVPSFtu8yb+/4w8MNjl0W7kfDtVGk/tQ8V
-siIWDDHugBd/Dy7nbJWRoO5Te6n+nPrvUvVUoIRh1HB5dvLwFyd6o9etert1UjaA
-3ySpW3uyHl6Fmd9zUtkO4voaJuuHYLPbksztOaldeGTzb9BfxZWjpZegAJM7Dg/5
-QxydHzFBbjxzccbHsbixpx+T+ZGgkiBPEQVBsn/NRmTgQiAhCjCvQgQyJr0Jizht
-mJogOHIQDVPxYQIb83mQ
-=os/Q
+iQEcBAEBCAAGBQJRauoxAAoJEMbwO6tnXQ0srj4IAMNe8Vs9HVqMrfC7Nj9behjN
+LNqmVhKYJeMBpiOGnzzC24A/EL/slRem+F79qR8EZ9ofZ+VM5iJ02+f7/QZ72EKX
+OzPwobZ9FS3jZ4j0FxGia0tJ8JxP+TIzCAsHz+aXxX7SmkB5FiJRPpEv/K8Luib1
+1pdNsIwjnvkEbr3in7olAd8SSyTCeKIn5mrCwSXmUmJjdYshdN8+fhF/9iQB1yq/
+gKH5qLoFcw878rIYXdwZddM60Bi5tHg2UkCLVkO9qG8ysfFI9HWE/bdaUekR7nRq
+Bgd0AkJ54W4jmG9iA9L5aUOOpN2Qila0XXEyfcDj4t/aEDyjijD9sQZgWxqvhjw=
+=s/TB
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
new file mode 100644
index 000000000000..c0819d88acc8
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r2.ebuild,v 1.1 2013/04/14 17:41:44 kensington Exp $
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+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 ~arm-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:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.20.0-r1[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	ncurses? ( sys-libs/ncurses )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+"
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	"${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.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.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.8.10-desktop.patch
+	"${FILESDIR}"/${PN}-2.8.10-libform.patch
+	"${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-implicit-include.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindImageMagick.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:]]+' | tail -n1 | 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.
+	#    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|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+pkg_setup() {
+	# bug 387227
+	addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+	cmake-utils_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.10.2-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch
new file mode 100644
index 000000000000..6a79a58d70c7
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/465898
+
+--- Modules/FindImageMagick.cmake
++++ Modules/FindImageMagick.cmake
+@@ -81,7 +81,7 @@
+       ${ImageMagick_INCLUDE_DIRS}
+       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
+     PATH_SUFFIXES
+-      ImageMagick
++    ImageMagick ImageMagick-6
+     DOC "Path to the ImageMagick include dir."
+     )
+   find_library(ImageMagick_${component}_LIBRARY
+@@ -147,17 +147,17 @@
+     )
+   if(component STREQUAL "Magick++")
+     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
+-      Magick++ CORE_RL_Magick++_
++	    Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
+   elseif(component STREQUAL "MagickWand")
+     FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
+-      Wand MagickWand CORE_RL_wand_
++	    Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
+   elseif(component STREQUAL "MagickCore")
+     FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
+-      Magick MagickCore CORE_RL_magick_
++	    Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
+   else()
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
new file mode 100644
index 000000000000..a7e8688ec872
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
@@ -0,0 +1,22 @@
+--- Modules/FindPythonInterp.cmake
++++ Modules/FindPythonInterp.cmake
+@@ -60,6 +60,10 @@
+ 
+ list(APPEND _Python_NAMES python)
+ 
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++    set(_Python_NAMES python)
++endif()
++
+ # Search for the current active python version first
+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+ 
+@@ -76,7 +80,7 @@
+ unset(_PYTHON3_VERSIONS)
+ 
+ # Search for newest python version if python executable isn't found
+-if(NOT PYTHON_EXECUTABLE)
++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
+     foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+       set(_Python_NAMES python${_CURRENT_VERSION})
+       if(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
new file mode 100644
index 000000000000..80cc4d38873f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
@@ -0,0 +1,24 @@
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake

+index bffa9fb..8fc90ee 100644

+--- a/Modules/FindPythonLibs.cmake

++++ b/Modules/FindPythonLibs.cmake

+@@ -74,6 +74,19 @@ set(_Python_VERSIONS

+   ${_PYTHON_FIND_OTHER_VERSIONS}

+   )

+ 

++# Gentoo portage requires that you use exactly the given python version

++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)

++    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"

++                    OUTPUT_VARIABLE _Gentoo_Python_VERSION)

++    list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)

++    if (_Gentoo_Python_INDEX EQUAL -1)

++       # the current Gentoo python version is not compatible with what is requested

++       set(_Python_VERSIONS)

++    else ()

++       set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")

++    endif ()

++endif()

++

+ unset(_PYTHON_FIND_OTHER_VERSIONS)

+ unset(_PYTHON1_VERSIONS)

+ unset(_PYTHON2_VERSIONS)