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

Package-Manager: portage-2.2.00.15335-prefix/cvs/Darwin powerpc
RepoMan-Options: --force

4 files changed, 84 insertions, 4 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/Manifest b/dev-util/cmake/Manifest
index efa6bc3d4c31..b5011ff0bd9d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -5,6 +5,7 @@ AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 RMD160 38094f9f8516656cc30d6ead
 AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 RMD160 d927ce8bb08d57f452db3371a0b2e11d252b96c9 SHA1 6f88171a816c1157ddcf3c3d5c3e3ec080471883 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7
 AUX cmake-2.6.4-FindBoost.patch 1094 RMD160 58cbed09bcb5fadf166cf64481f9605b5882f6a2 SHA1 5a3a91737b436e9de50c955bdb3e32b8fa7bed30 SHA256 a3f266086335b96af8e0dd848a05a10373762de9b9d6cc3b8af4b27fb43d362c
 AUX cmake-2.8.0-darwin-default-install_name.patch 911 RMD160 6261482ff3f989ce455ea87cd5c540385420149b SHA1 6c473a538204826210f62fabdfafb2f5f19087bb SHA256 98b93389ad9a39c819b90f8694a9fb208da6bad15dbe1ca72e62783803ff5b6d
+AUX cmake-2.8.0-darwin-no-app-with-qt.patch 2983 RMD160 088b54f0c1fd7d43867c0479deee0caada3a5fcd SHA1 1737e954c7bbb55f007226c48feac596ac290c45 SHA256 f678cb03ee646a231eedda894e8965bf7bc83b693b249e1ecd4590e933323224
 AUX cmake-2.8.0-more-no_host_paths.patch 2981 RMD160 4a6de86385e6bc0c42d49c4860300d590077cc81 SHA1 f13b33f5f8724590ff5edd57486c079fffd08f4b SHA256 e3b6a554239ee0cfc2dcac5298b702d9eca4b403f5839db9bb6ad3f42cfd6d81
 AUX cmake-FindJNI.patch 2020 RMD160 4fcb9714de65eb146a2696cd6613357684515b2d SHA1 c463daa6e7d3a1d7065607f97993b5da3486e7e1 SHA256 c5390550c192aea18415087ed891f7e5192b2a385c9c72f4cda0c19b13f6bfbb
 AUX cmake-FindPythonInterp.patch 498 RMD160 a4113724d0c2bdb53e7c947790d8a7e337759c84 SHA1 abd7754549fef5aae515361acd6a509c98227bf5 SHA256 8c3d4dc1898eae4adaa392b556286076594470277bc7c1bddbe2a28213fff7c0
@@ -14,7 +15,7 @@ DIST cmake-2.6.4.tar.gz 3285371 RMD160 e4217067537f76e52317514cb5bb0cf38733d16a
 DIST cmake-2.8.0.tar.gz 3553247 RMD160 27e80a14b4970d85b12aaf18fbe738c02dc0620f SHA1 c35cb0d787c53aee768b154f05b68d3a20eccb3d SHA256 847d615ecadb97f2cd05964cad6b019b68a952cad0db1e8c05222dfc599f476d
 EBUILD cmake-2.6.4-r3.ebuild 3476 RMD160 e20f6f85b5291ced7e3ee53ff933a0da704b8f14 SHA1 72bb72aeea2261d1c5c5642018234803c35c32c5 SHA256 1c4a2f60dffb72d1134932b580e46d07a7784420a0c786f204d4b71dbfd928f0
 EBUILD cmake-2.8.0-r1.ebuild 4030 RMD160 46029d880f87bc391fa520ce26d6ee1c3693bb6b SHA1 ed6c5a44bfb151a02f2d659b59bebc32a86ae1f4 SHA256 a113d79466309a00e926d03a626ca99fbd07bab642a2df37c44de18ae51908b6
-EBUILD cmake-2.8.0-r2.ebuild 4082 RMD160 b04a8bae0ce7c814630602db2eefc6f0126cf3b1 SHA1 f6e5de40918e99570a982a45d961408eb02e4b44 SHA256 9ab9aa89ea19533b8260f78023128dbf12f1b720df3b450e33ba1a42ca9ca5ea
+EBUILD cmake-2.8.0-r2.ebuild 4130 RMD160 e601e97ce5d17468faa87c7e9e12cd8d4c896489 SHA1 03b114318fc0ac91a33dca2c5a2d7670424a3623 SHA256 879992f738fa4d0bc23382836aa598336ae3dfffb3cf169689a55532e3720545
 EBUILD cmake-2.8.0.ebuild 4008 RMD160 402f951ece154f1fcc985c03a9272a569332ec24 SHA1 a2ff18b01ce1286b3324719f06bc2c9af70a94d0 SHA256 64394e560dc135b007792932b34138f30c0652055aac6c5135f9352f42f9ce69
-MISC ChangeLog 19646 RMD160 b085a460aebd666dc7c21fde6d94751f10cee49d SHA1 8eddc662167850adae4a4953b80cb02dab9afc88 SHA256 065836a1c24a22b811a2d363048d1df62fb7b2364bfae973eb4c9c0f0ab560c3
+MISC ChangeLog 19841 RMD160 3bf7348b672a8ec3c0e180e33b1145d5783b0793 SHA1 ad0548b4d6ee28faf77733837c69c66735986401 SHA256 42efacd1d6382eb52b8c6171a8d2849df39b008485d31a1fe0f0f9339cc83186
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
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