Version bump wrt bug #431946.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux i686

4 files changed, 335 insertions, 2 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index ab62de735b10..e27081d1eb30 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.213 2012/08/18 02:00:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.214 2012/08/19 12:50:34 johu Exp $
+
+*cmake-2.8.9 (19 Aug 2012)
+
+  19 Aug 2012; Johannes Huber <johu@gentoo.org> +cmake-2.8.9.ebuild,
+  +files/cmake-2.8.9-more-no_host_paths.patch:
+  Version bump wrt bug #431946.
 
   18 Aug 2012; Johannes Huber <johu@gentoo.org> cmake-2.8.8-r3.ebuild:
   Stable for x86, wrt bug #431520
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 2bf73d15f978..e75d51834399 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 50cmake-gentoo.el 244 SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 SHA512 70af0b9dd41f08531d3c754dc8af3662df8a22b469b79e8c40b7caae3205be1d4dc81d8b41837d1b6a46f2c348f5407e09e02269823c45c3366777e3bc7a0dcb WHIRLPOOL aa60ffe7e5edd00fdbb32ce2c9aee24fddd6e4d064b8bde55c7ff3b42196c3420596653aade9cc447a3293050c5ab23a27a556f26806e4d67139d264a38d1aaa
 AUX cmake-2.6.3-darwin-bundle.patch 952 SHA256 5429d3d7ba0d2bf2528b4cbf2bd36d3c83a051c064faa9c308d9adfeee334bca SHA512 c355e4f7e578d9837bc172ce22104103f9783390b97cec7bdd2e167880d2c70bc115a1c1146a125e1c501c42c9045d0997ce966edd69fbd791841365fe92c9e0 WHIRLPOOL ecd7cf46c1f07b8bccc8948904710895dd581764f12af5cf0ca0770e9c3b89a30019f59429dc628a42e320e67039ab985e982a3ad6932c7d42c2877af1c9aa7b
 AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439 SHA512 fe3148f9a09363c5943f09b963391a4276f2da6095e66c28a1c365fd655e2124e1931b40890152836e24a3c9e330db799199d8ae295fe4581f7124b42f09f928 WHIRLPOOL 322a805a2df9afa40c7ff217481819462d90d8259856696fa4ef76fda1571fa081577eb8cd06fbee899911b01243a912e43a9dcc667932f9885492fcb92c0f98
@@ -15,10 +18,24 @@ AUX cmake-2.8.8-FindPkgConfig.patch 658 SHA256 3261fce9682f476f121aa3d30126e4f8d
 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 4925 SHA256 025e450121c4ff3d504a88373400ac5f75e3f83a0130d9461a375f92aeb0d110 SHA512 69eb0360cc6cbcc5a87606dbb6399b3afbd5d9cce04f6d22e53173a95fdd3606b3b88d9f4dcc5895495dda14d9c51624cd1e98ada8b017d5181d50bbeb9d47a0 WHIRLPOOL 88d11adcf5e80e3aa771447bd946d40c6e441aaa65d774c2eed2ea02e679d59aad1c78c458c5c8f3aad847af335cfdaeb9b7a1eb3fdda434e1d5e1c9340e9f8d
-MISC ChangeLog 34314 SHA256 06f23f08bd70033cd362fce23d7708df4ebefe632d283684e0073d65c1906b67 SHA512 868313f5145a248f1a7069593f4ea586f41ba1c5bf74d570dfd2ea96f6f2964fe58a2496944ed7e8e342cd6023138fe136373eb02910d3279fa73b53bf7df4ec WHIRLPOOL f302a83148a6d66c49e1c75a304ecade10671a1edc2892ae8f102e0bd0edbd76b7321da86a7e1f5f764257dc283c96c894760d12969c3dc7e174b247bce469d8
+EBUILD cmake-2.8.9.ebuild 4884 SHA256 b586b59a36a12d7a8dff3397b1a6a8cb1b9d1676d66efb9ff057792bf6b6e75a SHA512 8a86734272da6cd5759dfd6177178421d874f1dd9e0b2c447baa964c2fe87fb5cecd12d072e64f226569c6409ff9243c7c36c3247d25ffb21a8a1e59b47231a9 WHIRLPOOL a08cc5c9031918a298db5298a34ce19f419b5762cf322009de4feffe0cc8211cbedb79f5894ea557ec7f75a12445464076f3e4bc6346b9e8c813f09ef7578dbe
+MISC ChangeLog 34491 SHA256 826ef740f88e05a9dc90e5c866e43cc83afdbfcba327cda82c9dc7d1ffdfeb23 SHA512 9d14759ed713dac728caca979580fbb4b9d2bb16f17cb8ca8e9ac2180279ab6f19a8b35101f3a77ea45ae4baf839a9ab3356b38ad0fb04be683eafac5f177854 WHIRLPOOL b2b597f6f586c76af0af48033738b31e4a1a681f97812389d1dad1027d8f4b00734bf572130b3cf5294f4a401b4ea31c87f9aecdd85644e19ed8779f863fb728
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQMOJpAAoJEO+t9ga+3I3akqIH/33Lp8tSBATg6/b9wZG2d7BC
+nvSg5p+T10gqtXCkPL5u6EZNLGOsRtz9/z8Vbie1Oi/DmKYlOlmtyi4dvximbmb8
+LdvI/yx5apbcAzSCjSPP35Kq2HOg9elYle/qBPuBK+LNT7SDdLVCv7vrXjizgIC/
+ShEZQxafjWM1EJjmq8SSeMJghTEskh66bqQQtVikenGiiAsrNd3A+Ui5a8fea5uW
+bkxfKdb0cynhLZqddUzcJ7wldFyB/mD5WMmotpjwuwwq99WyLCs9h3LLhtnuvuil
+xW4d5NpP4ncgP8s+5Tt8Rr5J/zqwJoNbHD3+l5jI/iPta1ag9wbPPWv5SARwTEY=
+=x/gB
+-----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.9.ebuild b/dev-util/cmake/cmake-2.8.9.ebuild
new file mode 100644
index 000000000000..c459a08620f7
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.9.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.9.ebuild,v 1.1 2012/08/19 12:50:34 johu 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
+		)
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+S="${WORKDIR}/${MY_P}"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
+	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+	"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
+	"${FILESDIR}"/${PN}-2.8.1-libform.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
+	"${FILESDIR}"/${PN}-2.8.8-tests.patch
+	"${FILESDIR}"/${PN}-2.8.9-more-no_host_paths.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 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.
+	#    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.9-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
new file mode 100644
index 000000000000..4e833ca1c223
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
@@ -0,0 +1,133 @@
+From 3f5fa933d17e24cafd75ae28c00f4fc0292eae92 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Wed, 15 Aug 2012 14:42:16 +0200
+Subject: [PATCH] Set some proper paths to make cmake find our tools.
+
+The ebuild now adds an extra / at the end of $EPREFIX so that it is
+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
+correct)
+
+Original patch by Heiko Przybyl.
+Updated by Chris Reffett (cmake-2.8.8)
+Update by Johannes Huber (cmake-2.8.9)
+---
+ Modules/Platform/Darwin.cmake    |   12 +++++++----
+ Modules/Platform/UnixPaths.cmake |   43 +++++++++++++++++++-------------------
+ 2 files changed, 29 insertions(+), 26 deletions(-)
+
+diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
+index eff07b2..cbedc47 100644
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -228,24 +228,28 @@ SET(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK
+       "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
+ 
+ 
+-# default to searching for frameworks first
++# default to searching for frameworks last
+ IF(NOT DEFINED CMAKE_FIND_FRAMEWORK)
+-  SET(CMAKE_FIND_FRAMEWORK FIRST)
++  SET(CMAKE_FIND_FRAMEWORK LAST)
+ ENDIF()
+ # set up the default search directories for frameworks
+ SET(CMAKE_SYSTEM_FRAMEWORK_PATH
++  @GENTOO_PORTAGE_EPREFIX@Frameworks
++  @GENTOO_PORTAGE_EPREFIX@usr/lib
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /Network/Library/Frameworks
+   /System/Library/Frameworks)
+ 
+-# default to searching for application bundles first
++# default to searching for application bundles last
+ IF(NOT DEFINED CMAKE_FIND_APPBUNDLE)
+-  SET(CMAKE_FIND_APPBUNDLE FIRST)
++  SET(CMAKE_FIND_APPBUNDLE LAST)
+ ENDIF()
+ # set up the default search directories for application bundles
+ SET(_apps_paths)
+ FOREACH(_path
++  @GENTOO_PORTAGE_EPREFIX@Applications
++  @GENTOO_PORTAGE_EPREFIX@usr/bin
+   "~/Applications"
+   "/Applications"
+   "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
+index 5ee7ddb..961746d 100644
+--- a/Modules/Platform/UnixPaths.cmake
++++ b/Modules/Platform/UnixPaths.cmake
+@@ -33,6 +33,7 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+ # search types.
+ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+   # Standard
++  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
+   /usr/local /usr /
+ 
+   # CMake install location
+@@ -44,43 +45,41 @@ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ 
+ # List common include file locations not under the common prefixes.
+ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-  # Windows API on Cygwin
+-  /usr/include/w32api
+-
+-  # X11
+-  /usr/X11R6/include /usr/include/X11
+-
+-  # Other
+-  /usr/pkg/include
+-  /opt/csw/include /opt/include  
+-  /usr/openwin/include
++  @GENTOO_PORTAGE_EPREFIX@usr/include
+   )
+ 
+ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-  # Windows API on Cygwin
+-  /usr/lib/w32api
+-
+-  # X11
+-  /usr/X11R6/lib /usr/lib/X11
+-
+-  # Other
+-  /usr/pkg/lib
+-  /opt/csw/lib /opt/lib 
+-  /usr/openwin/lib
++  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++  @GENTOO_PORTAGE_GCCLIBDIR@
++  @GENTOO_PORTAGE_EPREFIX@usr/lib64
++  @GENTOO_PORTAGE_EPREFIX@usr/libx32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib
++  @GENTOO_PORTAGE_EPREFIX@lib
+   )
+ 
+ LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-  /usr/pkg/bin
++  @GENTOO_PORTAGE_EPREFIX@usr/bin
++  @GENTOO_PORTAGE_EPREFIX@bin
+   )
+ 
+ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+-  /lib /usr/lib /usr/lib32 /usr/lib64
++  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++  @GENTOO_PORTAGE_GCCLIBDIR@
++  @GENTOO_PORTAGE_EPREFIX@usr/lib64
++  @GENTOO_PORTAGE_EPREFIX@usr/libx32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib
++  @GENTOO_PORTAGE_EPREFIX@lib
++  /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
+   )
+ 
+ LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
++  @GENTOO_PORTAGE_EPREFIX@usr/include
+   /usr/include
+   )
+ LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
++  @GENTOO_PORTAGE_EPREFIX@usr/include
+   /usr/include
+   )
+ 
+-- 
+1.7.9.7
+