Add dev-util/cmake-3.5.2-r1

11 files changed, 546 insertions, 17 deletions

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index db86df94..294f7e78 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,15 +1,20 @@
 AUX 50cmake-gentoo.el 244 SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 SHA512 70af0b9dd41f08531d3c754dc8af3662df8a22b469b79e8c40b7caae3205be1d4dc81d8b41837d1b6a46f2c348f5407e09e02269823c45c3366777e3bc7a0dcb WHIRLPOOL aa60ffe7e5edd00fdbb32ce2c9aee24fddd6e4d064b8bde55c7ff3b42196c3420596653aade9cc447a3293050c5ab23a27a556f26806e4d67139d264a38d1aaa
 AUX cmake-2.8.10-darwin-bundle.patch 956 SHA256 8195342561ada36d4e3796a906fc662f9f84cc470809e7596b4376f3fe90dbac SHA512 39f444f592f435fbcc865a903ccb851b6c40ddf5f3b99b986c92af6b8984978d4fa1819808f1365f53887098da8533c31f6ea29e14cb541045ed3f63fcc771e2 WHIRLPOOL c20412508cad6329bebfb152051008c5ff98f0a27657d047992f4523a213d4ee396ea23c009ad2133b283ab4518d359b2b65d5034e06bd5649a6f08d76cb5db8
 AUX cmake-2.8.10.2-FindPythonLibs.patch 968 SHA256 4a2bbd60a2c526387ac8088d6bbecff1cc4399259d737530f2d55a6afd033b15 SHA512 e42713242202409e06a1b0725c6ea0a89c6d623d143e6c06def9681b72516a760ebddeccdf16e141e6b21ced2fb63e42337536afd6ca799e6d6d8689d48037cb WHIRLPOOL f92e7981f267310e471425b9f6595c54bf6df2af3fd99a0502bebaa39d87dcc14e31389d1c1bd99271718ce6b33f837842a0cdb454de09da60df5252f86cf826
-AUX cmake-2.8.12.1-FindImageMagick.patch 1700 SHA256 042a843bc6204efee071af2cdeb451c5da3da852cba0d522dea1d264ff1014c3 SHA512 4c533e3bf3127eb0696b557fe381bfd88f3ebc70b29a33f04b7bf95fa7c765cb237abe34b6a406b452dd71fbc3d79740d58ae981eedca952f9fae272ea4f5efa WHIRLPOOL 25c5c7c47b2874b32143a9fe14443aa6da8f3abb6c92b0bd94f3848dd7d8114d901a0bc6fbb78547879f5af947f87f070e24cc2deeecd7bb4cc95290a7af7d40
-AUX cmake-3.0.0-FindBLAS.patch 1577 SHA256 25be4e8671eff94b5cb7fe955215d9b97cc39e61f7203b4eb9b28e16977c3842 SHA512 c6239fe3d8b8e437b66399a3ebdf09da94f747dc6c45aaaba43773ce29a106727c7d4f8a570e1fd9603a9cdbade6b9702398c1989267adbcc5aebbeb59d30915 WHIRLPOOL 44366678ff681b3c876c90274d3b6709ad4ef7de051663db03fecdb77baffbd87b02c5edf53126b383680a58ef4c0a0100982240e58db352c781cd204907f2bc
+AUX cmake-2.8.12.1-FindImageMagick.patch 1704 SHA256 c38d003b1a09cc86d0aa1697f290efed1b0740c6fe8b5e2d667227985b53f2ad SHA512 d27d80a64a19f428cbc50e4c82330ed841e41787669a3f58565e7ade1e208938a35b35e14788b45bfca22aa2fa151655c9bc1bed9c3b20fedf7f71df45083408 WHIRLPOOL a66e8b80ca56e6110d28f189dcf409f32adc8dcdc9268beaf58b0944a127bd4463a324ce9fcfa96c56e2817a24ccacfe9ed1990c06c81d41749fee89533e7fad
+AUX cmake-3.0.0-FindBLAS.patch 1581 SHA256 f9a8f3eead07dc66b9465a9c66db7faa547f5625938d95d9650c037cdd4c775a SHA512 c73533071df93975a2dc9ba1e17fb16bd396ec816ec9b2b4b714923ea6db606baea82c378bb50d7bb9d918e54c661489265e1032b24d03b2ba924489d01510f7 WHIRLPOOL d65649995d7c745d3536c66a76af3749eafa5bf04214dca807c04a2ba7aaa7a97398f0f2553cb1b90b5e32b0275e45251f3adbb53314ec9dc6f23e97447bcaa0
 AUX cmake-3.0.0-FindBoost-python.patch 6481 SHA256 bd8ff52ce3565ab67806e2417d3c1e3c05215dde1da588f65dfc8db061ea3116 SHA512 4eed678c74af89e249de7202c553825cfd0132b84d605d078c388224a1add76acef778f366bb60e52e58e9ca25a23e18f8f6bef7385a9180fb1cab7d7698ffbf WHIRLPOOL ba4965b6e390a30178cd99806eda5d1fd669ccb894ba94d1f8ea358dcfbf10f9559918711912786cc3be16569b87d931d13712bd84a433b561f1092d8c71c416
 AUX cmake-3.0.0-prefix-dirs.patch 4301 SHA256 32555d1ea3ef7a0328b28811e6792af379b8805a9349a0e135d0c77a724dc3db SHA512 ab1fec8ade01c4ae8eafa14b348ec323db0ef42c3cc8ec5a3abbe3bc045eac93db6d686207d5687f151a5ae81ea4dc039b9e601a11e1f05172b2276e3f6594a3 WHIRLPOOL b40f17bc8d273154eb4cc654b0028ee3bef003241fa4a497e9e087c9aca4f0382859659d053f7276f2c0dee18db36709f561ca63ae8f12dc712be7d58ebbcf44
-AUX cmake-3.0.2-FindLAPACK.patch 1442 SHA256 394388bdf47c995bc540537ad2cb497c719eafc5298a19d41d1a672c02d3b221 SHA512 60b673005bb3cec6830a3f68922c5661bccd8d7d39d77172d1f59383e8f9912e3e74e052d5e632479d1b091357dbabef656049dffaf705cebae9ae99ea35e74e WHIRLPOOL 7b46096381aa9a94e92c9aac80993a3da75b80203050f609adf7672ac238d4dd3ad89ff8261e87bd040a4ba5b4b1b4e73bfdf9ac3ba55b2c33a6f7800315748c
-AUX cmake-3.1.0-FindPythonInterp.patch 1072 SHA256 463c0a681b92ed02f7802153457d530109c6a6ec686d6c02968ea84085134705 SHA512 5e3445f43793fbea561d24cf502d06264f3f27134420d7df18aee678901bb895912a0b7b7f73ec7321155284f821aab5dbd6046bb050c02f58a0bd5188dc85f0 WHIRLPOOL 65aaa246da0230df4ff45a21e398224751d67820153ed5b871ee6095ae97804da98057de114354ec7ff2abb8f438fbcdd5c0b70a718fef6974d39ee69f94ca6e
-AUX cmake-3.1.0-darwin-isysroot.patch 1922 SHA256 05b3f77f8f8a25c809cf0819867fa785a739d3dc9c34e5e9fbbb6b4ad9115710 SHA512 9fcdac45f1c4d8c90839e5f4a6c9f1d28c1767bf6b1767dd7d8d04d332558ef8dc775af65926c3d08a72a6e535c063a85956bf20a10e48016fa13533037979d0 WHIRLPOOL 31ea327e6c41132923a26dfce39b19961b1862e79fcfa3f9c80773f6c3181acbf44ab655a2b837c0ab2165d918c8709aa82321958ca4e0d93277d0a2a47c1127
-AUX cmake-3.3.1-x32.patch 12008 SHA256 37948928976fdfb53f175e319f830d32867ec6234bea2a36ee2413490c3c79ed SHA512 bd860a6c7f47d453b73c771939c70a1a8a6d92287eea27481e114cd2fac4d35bec59c78d1256d09000c9f02a02dd93506b1afbd71d630f8b66e6f63472f05847 WHIRLPOOL d6f594b030f622d018ed7bb2f6bb56af87fb11657d6c2ca5e55d4e1676975f8b2ff9bd0a3312e9643abf2772866a031f089ebc1ec6ff0866afb2d9b80b8d9bca
+AUX cmake-3.0.2-FindLAPACK.patch 1369 SHA256 2bc2db5e12612215bb316614d1cc3a62fcc8719b7fce2af77a1592e049296103 SHA512 4f20c4475841201c28ad49539fe896345add626dad5615357ff01817e10f7315ffe39e3a8d4bd0270179d7c58e5679a5bd9ae2accc1019ecee91db380ba48577 WHIRLPOOL 77d78e46220622224afc3a8c90f712c1be3f67af71080f4659dd2afe31cee8c6fc7d2d6aabb5adeff7af0ea91a97d40b443ffe48cbadef88a7df634fd118014a
+AUX cmake-3.1.0-FindPythonInterp.patch 999 SHA256 62d03df86ba9d23c599277ddb7a1376583f2b60ecc3dd4bf14da15d1ecd0c4f1 SHA512 a8415b3b9e5ae021cf8616d9aa4eb9600005ff9d8bfaa3093307d3256d2fa903297cfc04525421239d4cddf8b3d68f43babd8dbc9fed8ef5d022300808cc334d WHIRLPOOL 4cc065302048586d4ce8e420a4214ca5b773e8009e31b564ba3d28f9bc5bae30b3f8b51fba57da20712b89598b9f63a757ccb0be2eacd04e4d1d85cf1d0b8b0a
+AUX cmake-3.1.0-darwin-isysroot.patch 1926 SHA256 edea0457c07fe886d61568d5f17d5e4f657ed61975280efced299c012f21b905 SHA512 0cbb55f8f5458e72b1e465577809287dcc270636aef192f039eb1e48ef78b933a7290f81c6fefb0dd1f5eb8f9d209766687ffcb4f37c702b8317f8d2e36236ad WHIRLPOOL 8afe5ddb8b590c897b64bbf15021eab7c0271fcc07532c405937700730d54afeb24afdc6b38a6cee04f28842a46f5b8447f7256bcc61a9ab9af0dffc0e3e81a9
+AUX cmake-3.3.1-x32.patch 12012 SHA256 77d05caf6e4ec8cb33843f2ee1a2c5b0a0620a0dc71f83756d2f631a0ff627d3 SHA512 2665b344d62896bd53859c25ff370fe693fc08bfcbdcaa0b56dc69f3d1cda41689fa3538af4d8b30e606438bcdfe04e80dbf4f6c9b48df8a7d220a2b700d6d52 WHIRLPOOL bb60ce76cde686add33b505712a13e6f05f4e0729be3f941d98c4ad597f36f1e6e8a091ae052dc6bae466cc81132c9c13d6d3642517cb05e230fec5148e0af88
+AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 SHA256 e3a8f2ff999ffe32c71de3779fb7b349120cafce7f2be26d89ba393085cffcad SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9 WHIRLPOOL 49add46771d80ead6d4648d747816e728f2b59bfddd403936b2e13079a9f268d126d56ba3c6de4bdf7c1eb91cb7c3391c9008f3b25ccee8ba38563753670487c
+AUX cmake-3.5.2-FindQt4.patch 1563 SHA256 d20f72576aaafe08b99ca1dd8f9e334b677710b27a942e98ffaa762526f00596 SHA512 a47b7b6817b5f2a3985ce67475a0d6d3b4ca5bdd7c7b283a49042b068114e497c66d306693bfe2ab53d9004e55b83af5f5ca1fd1357a786ebbae2a77544d0425 WHIRLPOOL 5d64a1698aa57dbf4b2f705a3eaed383736a002adf2b9126c86f7697edb501e7baded5677a0d6fdbc5ef44bcc47b10beaab0a73fab2d8e5d6f0016b148022068
+AUX cmake-3.5.2-x32.patch 11031 SHA256 88bee330560b048b11b20eec71bba72d40d7ffd68079724750d94e6d1eacca9d SHA512 cc69a01f1e5b86e67b86064a28e5a13b490612d9a9ee356b7f9771ca750c8561c6c2ce2abf7f5612591ac2c04992e538aa0b457975eed7d64d158d38cfaa16e4 WHIRLPOOL b8b1825259b072e6b236118748611c3505f894f4af99a5156939649b5ae9eeec1b7e665572c98efbf46d18c98c657b478bd018a5e1795464c020c32cd9a3e2c3
 AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
 DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
 DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
+DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84
 EBUILD cmake-3.3.1-r1.ebuild 5623 SHA256 ff33e44deb28650bddd83da51164ed0d5008943099b016465e31e6fa63c3913e SHA512 f5905ab88dbd1bc11484e00f57677f6830ecd23686a3c238937e6ddce518f84b4498eda3220a3992b24fa3770fc70e4aa50b671f84fcf1bdaf9255ce2efa2718 WHIRLPOOL 6d5b79be1a2cf87164d0b6d6249a6135ae6f68215a56a37e7c74902aa957cfde94e55e18c536701d56b57c47eea8c3f02c5e6e73db257707a4f71915ff116655
+EBUILD cmake-3.5.2-r1.ebuild 5408 SHA256 8a35df8c3416b6a58c01dec6f28732bd56cb19e5d1f5c4aad6a0b11b9c034385 SHA512 c12d7af089814cabe84837ce59a0a42b170c5df7da740d5ee50a282989c76fde5b17497df32767530ebd34c5789a93447b4c4ddecb365d735a041a57c74d3b30 WHIRLPOOL b16b4d027f15c79a0ad6d45ef872b44856e628ec28d75030613fa1cd4e6f06fd9c88f06d610da17d87ebbae6cfe148f429f2c90baf1f14eabff8368584e6b05a
diff --git a/dev-util/cmake/cmake-3.5.2-r1.ebuild b/dev-util/cmake/cmake-3.5.2-r1.ebuild
new file mode 100644
index 00000000..391632f3
--- /dev/null
+++ b/dev-util/cmake/cmake-3.5.2-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: c281a615f1ff0a52c7b241b9f7ce1437d4bc60e2 $
+
+EAPI=6
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+MY_P="${P/_/-}"
+
+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"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~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"
+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
+
+RDEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+
+	# upstream fixes (can usually be removed with a version bump)
+
+	# fix library directories
+	"${FILESDIR}"/${PN}-3.5.2-x32.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
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	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 and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${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.
+	#    BundleUtilities: bundle creation broken
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+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() {
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+	)
+
+	if use qt4 || use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/cmake-syntax.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/cmake-indent.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
index b094f179..0c423039 100644
--- a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
+++ b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
@@ -1,5 +1,5 @@
---- Modules/FindImageMagick.cmake
-+++ Modules/FindImageMagick.cmake
+--- a/Modules/FindImageMagick.cmake
++++ b/Modules/FindImageMagick.cmake
 @@ -147,17 +147,17 @@
      )
    if(component STREQUAL "Magick++")
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
index 86c5dc7f..342a4319 100644
--- a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
+++ b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
@@ -1,5 +1,5 @@
---- Modules/FindBLAS.cmake
-+++ Modules/FindBLAS.cmake
+--- a/Modules/FindBLAS.cmake
++++ b/Modules/FindBLAS.cmake
 @@ -4,6 +4,10 @@
  #
  # Find BLAS library
diff --git a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
index 57250e45..321f0530 100644
--- a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
+++ b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
@@ -1,5 +1,5 @@
---- Modules/FindLAPACK.cmake.orig	2014-09-15 23:50:11.377111987 +0200
-+++ Modules/FindLAPACK.cmake	2014-09-15 23:52:54.734388375 +0200
+--- a/Modules/FindLAPACK.cmake
++++ b/Modules/FindLAPACK.cmake
 @@ -4,6 +4,10 @@
  #
  # Find LAPACK library
diff --git a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
index 78f622d8..3abb2e40 100644
--- a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
+++ b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
@@ -1,5 +1,5 @@
---- Modules/FindPythonInterp.cmake.orig	2015-01-06 11:50:03.376357898 +0100
-+++ Modules/FindPythonInterp.cmake	2015-01-06 12:25:48.614989290 +0100
+--- a/Modules/FindPythonInterp.cmake
++++ b/Modules/FindPythonInterp.cmake
 @@ -75,6 +75,11 @@
  else()
      set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
diff --git a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch
index 119001ae..1f3599bc 100644
--- a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch
+++ b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch
@@ -1,8 +1,8 @@
 Do not detect Xcode and set -isysroot for its SDK, since that messes up
 our toolchain, and hence makes any compilation fail, bug #445308
 
---- Modules/Platform/Darwin-Initialize.cmake
-+++ Modules/Platform/Darwin-Initialize.cmake
+--- a/Modules/Platform/Darwin-Initialize.cmake
++++ b/Modules/Platform/Darwin-Initialize.cmake
 @@ -1,16 +1,16 @@
  # Ask xcode-select where to find /Developer or fall back to ancient location.
 -execute_process(COMMAND xcode-select -print-path
diff --git a/dev-util/cmake/files/cmake-3.3.1-x32.patch b/dev-util/cmake/files/cmake-3.3.1-x32.patch
index 4afb032b..11c84b9f 100644
--- a/dev-util/cmake/files/cmake-3.3.1-x32.patch
+++ b/dev-util/cmake/files/cmake-3.3.1-x32.patch
@@ -193,7 +193,7 @@
 -   if(KDE3_KDECORE_LIBRARY MATCHES lib64)
 +   if(KDE3_KDECORE_LIBRARY MATCHES lib32)
 +     set(KDE3_LIBTOOL_DIR /lib32/kde3)
-+   if(KDE3_KDECORE_LIBRARY MATCHES libx32)
++   elseif(KDE3_KDECORE_LIBRARY MATCHES libx32)
 +     set(KDE3_LIBTOOL_DIR /libx32/kde3)
 +   elseif(KDE3_KDECORE_LIBRARY MATCHES lib64)
       set(KDE3_LIBTOOL_DIR /lib64/kde3)
diff --git a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
new file mode 100644
index 00000000..2808ed79
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
@@ -0,0 +1,25 @@
+Don't use .so for modules on darwin/macos. Use .bundle instead.
+Patch by Heiko Przybyl
+
+Forward-ported from 2.8.10 to 3.4.0-rc1
+
+--- cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
++++ cmake-3.4.0-rc1/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 "")
+ 
+@@ -53,7 +53,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 ".tbd" ".dylib" ".so" ".a")
++set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".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-3.5.2-FindQt4.patch b/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch
new file mode 100644
index 00000000..845fc6e7
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch
@@ -0,0 +1,45 @@
+Ensure that the correct version of Qt is always used.
+
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
+
+There is no guarantee to which version of Qt these symlinks might point, so it
+is necessary to find the correct version explicitly.
+
+Once qmake is found, it is queried for the correct location of all other items.
+
+Gentoo-bug: 547222
+
+--- a/Modules/FindQt4.cmake
++++ b/Modules/FindQt4.cmake
+@@ -482,13 +482,23 @@
+ 
+   get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
+ 
+-  find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
+-    PATHS
+-      ENV QTDIR
+-      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
+-    PATH_SUFFIXES bin
+-    DOC "The qmake executable for the Qt installation to use"
+-  )
++  if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
++    find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
++      PATHS
++        $ENV{EPREFIX}/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
++        $ENV{EPREFIX}/usr/bin
++        NO_DEFAULT_PATH
++      DOC "The qmake executable for the Qt installation to use"
++    )
++  else()
++    find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
++      PATHS
++        ENV QTDIR
++        "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
++      PATH_SUFFIXES bin
++      DOC "The qmake executable for the Qt installation to use"
++    )
++  endif()
+ 
+   set(major 0)
+   if (QT_QMAKE_EXECUTABLE)
diff --git a/dev-util/cmake/files/cmake-3.5.2-x32.patch b/dev-util/cmake/files/cmake-3.5.2-x32.patch
new file mode 100644
index 00000000..34dfaeb1
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.5.2-x32.patch
@@ -0,0 +1,253 @@
+--- ./Source/cmFindPackageCommand.cxx
++++ ./Source/cmFindPackageCommand.cxx
+@@ -2105,6 +2105,8 @@ bool cmFindPackageCommand::SearchPrefix(
+ 
+   // Construct list of common install locations (lib and share).
+   std::vector<std::string> common;
++  common.push_back("lib32");
++  common.push_back("libx32");
+   if(!this->LibraryArchitecture.empty())
+     {
+     common.push_back("lib/"+this->LibraryArchitecture);
+--- ./Source/cmExportInstallFileGenerator.cxx
++++ ./Source/cmExportInstallFileGenerator.cxx
+@@ -95,8 +95,12 @@ bool cmExportInstallFileGenerator::Gener
+        << "get_filename_component(_IMPORT_PREFIX"
+        << " \"${CMAKE_CURRENT_LIST_FILE}\" PATH)\n";
+     if(cmHasLiteralPrefix(absDestS.c_str(), "/lib/") ||
++       cmHasLiteralPrefix(absDestS.c_str(), "/lib32/") ||
++       cmHasLiteralPrefix(absDestS.c_str(), "/libx32/") ||
+        cmHasLiteralPrefix(absDestS.c_str(), "/lib64/") ||
+        cmHasLiteralPrefix(absDestS.c_str(), "/usr/lib/") ||
++       cmHasLiteralPrefix(absDestS.c_str(), "/usr/lib32/") ||
++       cmHasLiteralPrefix(absDestS.c_str(), "/usr/libx32/") ||
+        cmHasLiteralPrefix(absDestS.c_str(), "/usr/lib64/"))
+       {
+       // Handle "/usr move" symlinks created by some Linux distros.
+--- ./Utilities/cmcurl/CMake/FindGSS.cmake
++++ ./Utilities/cmcurl/CMake/FindGSS.cmake
+@@ -205,7 +205,7 @@ message(STATUS "LDFLAGS: ${_GSS_LIB_FLAG
+                     endif()
+                 endif()
+             else()
+-                list(APPEND _GSS_LIBDIR_SUFFIXES "lib;lib64") # those suffixes are not checked for HINTS
++                list(APPEND _GSS_LIBDIR_SUFFIXES "lib;lib32;libx32;lib64") # those suffixes are not checked for HINTS
+                 if(GSS_FLAVOUR STREQUAL "MIT")
+                     set(_GSS_LIBNAME "gssapi_krb5")
+                 else()
+--- ./Modules/GetPrerequisites.cmake
++++ ./Modules/GetPrerequisites.cmake
+@@ -520,7 +520,7 @@ function(gp_resolved_file_type original_
+     string(TOLOWER "${resolved_file}" lower)
+ 
+     if(UNIX)
+-      if(resolved_file MATCHES "^(/lib/|/lib32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/lib64/|/usr/X11R6/|/usr/bin/)")
++      if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/)")
+         set(is_system 1)
+       endif()
+     endif()
+--- ./Modules/GNUInstallDirs.cmake
++++ ./Modules/GNUInstallDirs.cmake
+@@ -43,7 +43,7 @@
+ # ``LOCALSTATEDIR``
+ #   modifiable single-machine data (``var``)
+ # ``LIBDIR``
+-#   object code libraries (``lib`` or ``lib64``
++#   object code libraries (``lib``, ``lib32``, ``libx32``, ``lib64``
+ #   or ``lib/<multiarch-tuple>`` on Debian)
+ # ``INCLUDEDIR``
+ #   C header files (``include``)
+@@ -209,6 +209,16 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (
+           if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
+             set(__LAST_LIBDIR_DEFAULT "lib64")
+           endif()
++        elseif(EXISTS /usr/lib32)
++          set(_LIBDIR_DEFAULT "lib32")
++          if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
++            set(__LAST_LIBDIR_DEFAULT "lib32")
++          endif()
++        elseif(EXISTS /usr/libx32)
++          set(_LIBDIR_DEFAULT "libx32")
++          if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
++            set(__LAST_LIBDIR_DEFAULT "libx32")
++          endif()
+         endif()
+       endif()
+     endif()
+--- ./Modules/FindArmadillo.cmake
++++ ./Modules/FindArmadillo.cmake
+@@ -45,7 +45,7 @@
+ # UNIX paths are standard, no need to write.
+ find_library(ARMADILLO_LIBRARY
+   NAMES armadillo
+-  PATHS "$ENV{ProgramFiles}/Armadillo/lib"  "$ENV{ProgramFiles}/Armadillo/lib64" "$ENV{ProgramFiles}/Armadillo"
++  PATHS "$ENV{ProgramFiles}/Armadillo/lib"  "$ENV{ProgramFiles}/Armadillo/lib32" "$ENV{ProgramFiles}/Armadillo/libx32" "$ENV{ProgramFiles}/Armadillo/lib64" "$ENV{ProgramFiles}/Armadillo"
+   )
+ find_path(ARMADILLO_INCLUDE_DIR
+   NAMES armadillo
+--- ./Modules/CPackRPM.cmake
++++ ./Modules/CPackRPM.cmake
+@@ -437,7 +437,7 @@
+ #  list of path to be excluded.
+ #
+ #  * Mandatory : NO
+-#  * Default   : /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include
++#  * Default   : /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib32 /usr/libx32 /usr/lib64 /usr/include
+ #
+ #  May be used to exclude path (directories or files) from the auto-generated
+ #  list of paths discovered by CPack RPM. The defaut value contains a
+@@ -682,7 +682,7 @@ function(cpack_rpm_prepare_content_list)
+   endif()
+ 
+   if(NOT DEFINED CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST)
+-    set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include)
++    set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib32 /usr/libx32 /usr/lib64 /usr/include)
+     if(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION)
+       message("CPackRPM:Debug: Adding ${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
+       list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION}")
+--- ./Modules/FindPkgConfig.cmake
++++ ./Modules/FindPkgConfig.cmake
+@@ -255,10 +255,17 @@ macro(_pkg_check_modules_internal _is_re
+             list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig")
+           endif()
+         else()
+-          # not debian, chech the FIND_LIBRARY_USE_LIB64_PATHS property
++          # not debian, check the FIND_LIBRARY_USE_LIB64_PATHS property
+           get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+           if(uselib64)
+             list(APPEND _lib_dirs "lib64/pkgconfig")
++          else()
++            # hard-code regardless, since there's no discovery method provided
++            if(EXISTS /usr/lib32)
++              list(APPEND _lib_dirs "lib32/pkgconfig")
++            elseif(EXISTS /usr/libx32)
++              list(APPEND _lib_dirs "libx32/pkgconfig")
++            endif()
+           endif()
+         endif()
+       endif()
+--- ./Modules/FindGLEW.cmake
++++ ./Modules/FindGLEW.cmake
+@@ -35,7 +35,7 @@
+ #  License text for the above reference.)
+ 
+ find_path(GLEW_INCLUDE_DIR GL/glew.h)
+-find_library(GLEW_LIBRARY NAMES GLEW glew32 glew glew32s PATH_SUFFIXES lib64)
++find_library(GLEW_LIBRARY NAMES GLEW glew32 glew glew32s PATH_SUFFIXES lib32 libx32 lib64)
+ 
+ set(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
+ set(GLEW_LIBRARIES ${GLEW_LIBRARY})
+--- ./Modules/FindOpenAL.cmake
++++ ./Modules/FindOpenAL.cmake
+@@ -89,7 +89,7 @@ find_library(OPENAL_LIBRARY
+   NAMES OpenAL al openal OpenAL32
+   HINTS
+     ENV OPENALDIR
+-  PATH_SUFFIXES lib64 lib libs64 libs ${_OpenAL_ARCH_DIR}
++  PATH_SUFFIXES lib32 libx32 lib64 lib libs64 libs ${_OpenAL_ARCH_DIR}
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+--- ./Modules/FindIce.cmake
++++ ./Modules/FindIce.cmake
+@@ -205,7 +205,7 @@ function(_Ice_FIND)
+   endif()
+   # Generic 64-bit and 32-bit directories
+   list(APPEND ice_binary_suffixes "bin${_x64}" "bin")
+-  list(APPEND ice_library_suffixes "${_lib64}" "lib${_x64}" "lib")
++  list(APPEND ice_library_suffixes "lib32" "libx32" "${_lib64}" "lib${_x64}" "lib")
+   list(APPEND ice_include_suffixes "include")
+   list(APPEND ice_slice_suffixes "slice")
+ 
+--- ./Modules/FindKDE3.cmake
++++ ./Modules/FindKDE3.cmake
+@@ -230,7 +230,11 @@ set(QT_AND_KDECORE_LIBS ${QT_LIBRARIES}
+ get_filename_component(KDE3_LIB_DIR ${KDE3_KDECORE_LIBRARY} PATH )
+ 
+ if(NOT KDE3_LIBTOOL_DIR)
+-   if(KDE3_KDECORE_LIBRARY MATCHES lib64)
++   if(KDE3_KDECORE_LIBRARY MATCHES lib32)
++     set(KDE3_LIBTOOL_DIR /lib32/kde3)
++   elseif(KDE3_KDECORE_LIBRARY MATCHES libx32)
++     set(KDE3_LIBTOOL_DIR /libx32/kde3)
++   elseif(KDE3_KDECORE_LIBRARY MATCHES lib64)
+      set(KDE3_LIBTOOL_DIR /lib64/kde3)
+    else()
+      set(KDE3_LIBTOOL_DIR /lib/kde3)
+--- ./Modules/FindDevIL.cmake
++++ ./Modules/FindDevIL.cmake
+@@ -56,7 +56,7 @@ find_path(IL_INCLUDE_DIR il.h
+ 
+ find_library(IL_LIBRARIES
+   NAMES IL DEVIL
+-  PATH_SUFFIXES lib64 lib lib32
++  PATH_SUFFIXES lib lib32 libx32 lib64
+   DOC "The file that corresponds to the base il library."
+ )
+ 
+@@ -64,7 +64,7 @@ find_library(IL_LIBRARIES
+ 
+ find_library(ILUT_LIBRARIES
+   NAMES ILUT
+-  PATH_SUFFIXES lib64 lib lib32
++  PATH_SUFFIXES lib lib32 libx32 lib64
+   DOC "The file that corresponds to the il (system?) utility library."
+ )
+ 
+@@ -72,7 +72,7 @@ find_library(ILUT_LIBRARIES
+ 
+ find_library(ILU_LIBRARIES
+   NAMES ILU
+-  PATH_SUFFIXES lib64 lib lib32
++  PATH_SUFFIXES lib lib32 libx32 lib64
+   DOC "The file that corresponds to the il utility library."
+ )
+ 
+--- ./Modules/FindGTK2.cmake
++++ ./Modules/FindGTK2.cmake
+@@ -301,8 +301,12 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd
+     find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr}
+         PATHS
+             ${_gtk2_arch_dir}
++            /usr/local/lib32
++            /usr/local/libx32
+             /usr/local/lib64
+             /usr/local/lib
++            /usr/lib32
++            /usr/libx32
+             /usr/lib64
+             /usr/lib
+             /usr/X11R6/include
+--- ./Modules/CMakeFindPackageMode.cmake
++++ ./Modules/CMakeFindPackageMode.cmake
+@@ -85,7 +85,9 @@ if(UNIX)
+   # from the outside
+   if(NOT CMAKE_SIZEOF_VOID_P)
+     set(CMAKE_SIZEOF_VOID_P 4)
+-    if(EXISTS /usr/lib64)
++    if(EXISTS /usr/lib32 OR /usr/libx32)
++      set(CMAKE_SIZEOF_VOID_P 4)
++    elseif(EXISTS /usr/lib64)
+       set(CMAKE_SIZEOF_VOID_P 8)
+     else()
+       # use the file utility to check whether itself is 64 bit:
+--- ./CMakeLists.txt
++++ ./CMakeLists.txt
+@@ -574,7 +574,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+   if(BUILD_CursesDialog)
+     get_filename_component(_CURSES_DIR "${CURSES_LIBRARY}" PATH)
+     set(CURSES_NEED_RPATH FALSE)
+-    if(NOT "${_CURSES_DIR}" STREQUAL "/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/lib64" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib64")
++    if(NOT "${_CURSES_DIR}" STREQUAL "/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/lib32" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib32" AND NOT "${_CURSES_DIR}" STREQUAL "/libx32" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/libx32" AND NOT "${_CURSES_DIR}" STREQUAL "/lib64" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib64")
+       set(CURSES_NEED_RPATH TRUE)
+     endif()
+   endif()
+@@ -593,7 +593,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+     endif()
+ 
+     set(QT_NEED_RPATH FALSE)
+-    if(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
++    if(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib32" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib32" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/libx32" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/libx32" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
+       set(QT_NEED_RPATH TRUE)
+     endif()
+   endif()