[gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/

["Chris Reffett" <geekboy72@gmail.com>]

commit:     59cfdb5e8acff3f4d0e45a3db9736c7751358159
Author:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
AuthorDate: Sun Apr 22 15:02:04 2012 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Sun Apr 22 15:02:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=59cfdb5e

[dev-util/cmake] Update more-no_host_paths.patch to be compatible with cmake 2.8.8, add patch line to ebuild

(Portage version: 2.2.0_alpha100/git/Linux x86_64, unsigned Manifest commit)

---
 dev-util/cmake/cmake-2.8.8.ebuild                  |    1 +
 ....patch => cmake-2.8.8-more-no_host_paths.patch} |   23 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild
index 169a9bc..f3f6ff7 100644
--- a/dev-util/cmake/cmake-2.8.8.ebuild
+++ b/dev-util/cmake/cmake-2.8.8.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
 	"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
 	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch
 )
 cmake_src_bootstrap() {
 	# Cleanup args to extract only JOBS.

diff --git a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch
similarity index 83%
rename from dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
rename to dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch
index 38bad92..ca76835 100644
--- a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
+++ b/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch
@@ -1,13 +1,13 @@
 Set some proper paths to make cmake find our tools.
-Original patch by Heiko Przybyl
+Original patch by Heiko Przybyl, updated for cmake-2.8.8 by Chris Reffett
 
 The ebuild now adds an extra / at the end of $EPREFIX so that it is
 never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
 correct)
 
---- cmake-2.8.3/Modules/Platform/Darwin.cmake
-+++ cmake-2.8.3/Modules/Platform/Darwin.cmake
-@@ -217,19 +217,23 @@
+--- cmake-2.8.8/Modules/Platform/Darwin.cmake
++++ cmake-2.8.8/Modules/Platform/Darwin.cmake
+@@ -229,20 +229,24 @@
  
  
   
@@ -29,15 +29,16 @@ correct)
 +# default to searching for application bundles last
 +SET(CMAKE_FIND_APPBUNDLE LAST)
  # set up the default search directories for application bundles
- SET(CMAKE_SYSTEM_APPBUNDLE_PATH
+ SET(_apps_paths)
+ FOREACH(_path
 +  @GENTOO_PORTAGE_EPREFIX@Applications
 +  @GENTOO_PORTAGE_EPREFIX@usr/bin
-   ~/Applications
-   /Applications
-   /Developer/Applications)
-diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.3/Modules/Platform/UnixPaths.cmake
-+++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake
+   "~/Applications"
+   "/Applications"
+   "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+diff -ruN cmake-2.8.8.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.8/Modules/Platform/UnixPaths.cmake
+--- cmake-2.8.8/Modules/Platform/UnixPaths.cmake
++++ cmake-2.8.8/Modules/Platform/UnixPaths.cmake
 @@ -33,6 +33,7 @@
  # search types.
  LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH