From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SLyLa-0003vl-5q for garchives@archives.gentoo.org; Sun, 22 Apr 2012 15:05:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60234E0845; Sun, 22 Apr 2012 15:04:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2151BE0845 for ; Sun, 22 Apr 2012 15:04:58 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45D3B1B40F3 for ; Sun, 22 Apr 2012 15:04:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0F724E5402 for ; Sun, 22 Apr 2012 15:04:57 +0000 (UTC) From: "Chris Reffett" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chris Reffett" Message-ID: <1335106924.59cfdb5e8acff3f4d0e45a3db9736c7751358159.creffett@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/cmake/cmake-2.8.8.ebuild dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: creffett X-VCS-Committer-Name: Chris Reffett X-VCS-Revision: 59cfdb5e8acff3f4d0e45a3db9736c7751358159 X-VCS-Branch: master Date: Sun, 22 Apr 2012 15:04:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ca3d07cd-10b6-4428-980d-35f33b31a9b1 X-Archives-Hash: 644a472dd06bcac724575e673a97a0ce commit: 59cfdb5e8acff3f4d0e45a3db9736c7751358159 Author: Chris Reffett gmail com> AuthorDate: Sun Apr 22 15:02:04 2012 +0000 Commit: Chris Reffett gmail com> CommitDate: Sun Apr 22 15:02:04 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D59cfdb5e [dev-util/cmake] Update more-no_host_paths.patch to be compatible with cm= ake 2.8.8, add patch line to ebuild (Portage version: 2.2.0_alpha100/git/Linux x86_64, unsigned Manifest comm= it) --- dev-util/cmake/cmake-2.8.8.ebuild | 1 + ....patch =3D> 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=3D( "${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 Reffet= t =20 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) =20 ---- 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 @@ =20 =20 =20 @@ -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