Add patch by Heiko Przybyl not to build an .app on OSX with USE=qt4

(Portage version: 2.2.00.15335-prefix/cvs/Darwin powerpc, RepoMan options: --force)

3 files changed, 81 insertions, 2 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index a32caaf04090..1ff18e88780b 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.127 2010/01/31 15:49:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.128 2010/02/10 19:19:10 grobian Exp $
+
+  10 Feb 2010; Fabian Groffen <grobian@gentoo.org> cmake-2.8.0-r2.ebuild,
+  +files/cmake-2.8.0-darwin-no-app-with-qt.patch:
+  Add patch by Heiko Przybyl not to build an .app on OSX with USE=qt4
 
 *cmake-2.8.0-r2 (31 Jan 2010)
 
diff --git a/dev-util/cmake/cmake-2.8.0-r2.ebuild b/dev-util/cmake/cmake-2.8.0-r2.ebuild
index b866d2f98265..f8b5331fd9da 100644
--- a/dev-util/cmake/cmake-2.8.0-r2.ebuild
+++ b/dev-util/cmake/cmake-2.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0-r2.ebuild,v 1.1 2010/01/31 15:49:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0-r2.ebuild,v 1.2 2010/02/10 19:19:10 grobian Exp $
 
 EAPI="2"
 
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
 	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
 	"${FILESDIR}"/${P}-darwin-default-install_name.patch
+	"${FILESDIR}"/${P}-darwin-no-app-with-qt.patch
 )
 
 src_prepare() {
diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch
new file mode 100644
index 000000000000..8149917d0a49
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch
@@ -0,0 +1,74 @@
+Description: Don't build the GUI's app-bundle.
+Author:	     Heiko Przybyl <zuxez@cs.tu-berlin.de>
+--- cmake-2.8.0/CMakeLists.txt.orig	2010-02-10 19:38:03 +0100
++++ cmake-2.8.0/CMakeLists.txt	2010-02-10 19:38:49 +0100
+@@ -381,7 +381,7 @@ IF(BUILD_CursesDialog)
+ ENDIF(BUILD_CursesDialog)
+ 
+ IF(BUILD_QtDialog)
+-  IF(APPLE)
++  IF(FALSE)
+     SET(CMAKE_BUNDLE_NAME
+       "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
+     SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
+@@ -394,7 +394,7 @@ IF(BUILD_QtDialog)
+     ENDIF(NOT "${ENDCH}" STREQUAL "/")
+     SET(CMAKE_INSTALL_PREFIX 
+       "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
+-  ENDIF(APPLE)
++  ENDIF(FALSE)
+   
+   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")
+--- cmake-2.8.0/Source/QtDialog/CMakeLists.txt.orig	2010-02-10 19:39:59 +0100
++++ cmake-2.8.0/Source/QtDialog/CMakeLists.txt	2010-02-10 19:42:12 +0100
+@@ -66,12 +66,12 @@ ELSE(NOT QT4_FOUND)
+   IF(Q_WS_WIN)
+     SET(SRCS ${SRCS} CMakeSetup.rc)
+   ENDIF(Q_WS_WIN)
+-  IF(Q_WS_MAC)
++  IF(FALSE)
+     SET(SRCS ${SRCS} CMakeSetup.icns)
+     SET(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
+     SET_SOURCE_FILES_PROPERTIES(CMakeSetup.icns PROPERTIES
+       MACOSX_PACKAGE_LOCATION Resources)
+-  ENDIF(Q_WS_MAC)
++  ENDIF(FALSE)
+ 
+   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+@@ -79,13 +79,13 @@ ELSE(NOT QT4_FOUND)
+   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+-  ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
++  ADD_EXECUTABLE(cmake-gui WIN32 ${SRCS})
+   TARGET_LINK_LIBRARIES(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
+   IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+-    IF(APPLE)
++    IF(FALSE)
+       SET_TARGET_PROPERTIES(cmake-gui PROPERTIES
+        OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
+-    ENDIF(APPLE)
++    ENDIF(FALSE)
+     SET(CMAKE_INSTALL_DESTINATION_ARGS 
+       BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
+   ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+@@ -101,7 +101,7 @@ ELSE(NOT QT4_FOUND)
+     INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
+   ENDIF(UNIX)
+ 
+-  IF(APPLE)
++  IF(FALSE)
+     SET(CMAKE_POSTFLIGHT_SCRIPT
+       "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
+     SET(CMAKE_POSTUPGRADE_SCRIPT
+@@ -115,7 +115,7 @@ ELSE(NOT QT4_FOUND)
+     INSTALL(CODE "set(input_file
+        \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/${CMAKE_BUNDLE_NAME}\")")
+     INSTALL(SCRIPT "${CMake_SOURCE_DIR}/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake")
+-  ENDIF(APPLE)
++  ENDIF(FALSE)
+   CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
+     "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)    
+ ENDIF(NOT QT4_FOUND)
\ No newline at end of file