cmake updates: added FindJNI patch that makes it able to find IBM jdk, fixed Qt4 deps a bit, reordered variables to

ease merging in tools like kdiff3/kompare (SLOT is usually invariant so the idea is to place it between KEYWORDS
and IUSE), reformatted a bit for better (?) readability

4 files changed, 97 insertions, 9 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
new file mode 100644
index 00000000000..f7689dddc21
--- /dev/null
+++ b/dev-util/cmake/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for dev-util/cmake
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  25 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  +files/cmake-FindJNI.patch, cmake-2.6.3-r1.ebuild:
+  Added FindJNI.cmake patch - to find ibj jdk, fixed Qt4 deps a bit,
+  reordered variables to ease merging in tools like kdiff3/kompare (SLOT is
+  usually invariant os let's place it between KEYWORDS and IUSE)
+
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index b8d6717ef03..115fdca7bd9 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,6 +1,8 @@
 AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00
+AUX cmake-FindJNI.patch 2020 RMD160 4fcb9714de65eb146a2696cd6613357684515b2d SHA1 c463daa6e7d3a1d7065607f97993b5da3486e7e1 SHA256 c5390550c192aea18415087ed891f7e5192b2a385c9c72f4cda0c19b13f6bfbb
 AUX cmake-FindPythonInterp.patch 689 RMD160 77d7bb6e85fff6c54650de68ee241c28f2092bde SHA1 674f9a3ed0fcc2b92f2972cf0856ee2c88d59172 SHA256 b30f9f1d6f3c6100db7e98905f8d919fbb77b8c8bc5528d2f3874cb42eb28065
 AUX cmake-FindPythonLibs.patch 530 RMD160 3e012fbf78d649d6c8111d72d384da3b1b838268 SHA1 0576f44f61465b8403471f0648653226f843d3bd SHA256 1e7bff2a1e999ac877ffeac1414e54e1685c5ef303d698db50d81201029204ab
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.6.3.tar.gz 3594959 RMD160 14f0e878844f55a1b3d02837e98087dcaabb16be SHA1 bf34e1661954d808ac3a3eb9d394b69e4d3b1a98 SHA256 3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450
-EBUILD cmake-2.6.3-r1.ebuild 3203 RMD160 76b38bd94ff66ea0753ce7a906f0425bbeca988d SHA1 3afe9e42196b7250c3d5da14ae9cc849a1e8ca7b SHA256 72e77024ec16458b6776145862e243792fc80aee760c43cbeae7d8a36bb850b3
+EBUILD cmake-2.6.3-r1.ebuild 3201 RMD160 02c352c97bca077027c6de58a72170d123ba7f68 SHA1 cd5abbdcff3a9ff83ba45f8d4fd04d535b8c9452 SHA256 5793bf46aa64fb10f7c67de1bdaaabb1e60a7e8e0851c963fc082eed3137fac4
+MISC ChangeLog 443 RMD160 d7b5ff49316832dbe1341ee1b0205029ebc99b83 SHA1 decf83ed748e09bd156b362b10e68da8033ed353 SHA256 e9d9a5b982bad238d273c23893719cc299df2650f596c009e79a382f6949556a
diff --git a/dev-util/cmake/cmake-2.6.3-r1.ebuild b/dev-util/cmake/cmake-2.6.3-r1.ebuild
index 882674aeef8..f6ddb16b1cd 100644
--- a/dev-util/cmake/cmake-2.6.3-r1.ebuild
+++ b/dev-util/cmake/cmake-2.6.3-r1.ebuild
@@ -14,21 +14,24 @@ 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"
-SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+SLOT="0"
 IUSE="emacs qt4 vim-syntax"
 
-DEPEND=">=net-misc/curl-7.16.4
+DEPEND="
+	>=net-misc/curl-7.16.4
 	>=dev-libs/expat-2.0.1
 	>=dev-libs/libxml2-2.6.28
 	>=dev-libs/xmlrpc-c-1.06.09[curl]
 	emacs? ( virtual/emacs )
-	qt4? ( || ( ( x11-libs/qt-core:4
-			x11-libs/qt-gui:4 )
-		>=x11-libs/qt-4.3:4 ) )
-	vim-syntax? ( || (
-		app-editors/vim
-		app-editors/gvim ) )"
+	qt4? ( x11-libs/qt-gui:4 )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
 RDEPEND="${DEPEND}"
 
 SITEFILE="50${PN}-gentoo.el"
@@ -37,7 +40,9 @@ VIMFILE="${PN}.vim"
 S="${WORKDIR}/${MY_P}"
 
 CMAKE_IN_SOURCE_BUILD=1
+
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-FindJNI.patch"
 	epatch "${FILESDIR}/${PN}-FindPythonLibs.patch"
 	epatch "${FILESDIR}/${PN}-FindPythonInterp.patch"
 }
diff --git a/dev-util/cmake/files/cmake-FindJNI.patch b/dev-util/cmake/files/cmake-FindJNI.patch
new file mode 100644
index 00000000000..af723c52919
--- /dev/null
+++ b/dev-util/cmake/files/cmake-FindJNI.patch
@@ -0,0 +1,71 @@
+diff -ru ./Modules/FindJNI.cmake ../a/Modules/FindJNI.cmake
+--- ./Modules/FindJNI.cmake	2009-02-21 21:36:50.000000000 +0100
++++ ../a/Modules/FindJNI.cmake	2008-11-24 04:44:06.000000000 +0100
+@@ -2,7 +2,7 @@
+ # This module finds if Java is installed and determines where the
+ # include files and libraries are. It also determines what the name of
+ # the library is. This code sets the following variables:
+-#   
++#
+ #  JNI_INCLUDE_DIRS      = the include dirs to use
+ #  JNI_LIBRARIES         = the libraries to use
+ #  JAVA_AWT_LIBRARY      = the path to the jawt library
+@@ -51,6 +51,8 @@
+     "${dir}"
+     "${dir}/client"
+     "${dir}/server"
++    "${dir}/j9vm"
++    "${dir}/classic"
+     )
+ ENDFOREACH(dir)
+ 
+@@ -60,7 +62,7 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+-  /usr/include 
++  /usr/include
+   /usr/local/include
+   /usr/lib/java/include
+   /usr/local/lib/java/include
+@@ -126,7 +128,7 @@
+       )
+   ENDIF(JAVA_HAVE_FRAMEWORK)
+ ELSE(APPLE)
+-  FIND_LIBRARY(JAVA_AWT_LIBRARY jawt 
++  FIND_LIBRARY(JAVA_AWT_LIBRARY jawt
+     PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES}
+   )
+   FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM
+@@ -134,18 +136,23 @@
+   )
+ ENDIF(APPLE)
+ 
+-# add in the include path    
+-FIND_PATH(JAVA_INCLUDE_PATH jni.h 
++# add in the include path
++FIND_PATH(JAVA_INCLUDE_PATH jni.h
+   ${JAVA_AWT_INCLUDE_DIRECTORIES}
+ )
+ 
+-FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h 
++FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
+   ${JAVA_AWT_INCLUDE_DIRECTORIES}
+   ${JAVA_INCLUDE_PATH}/win32
+   ${JAVA_INCLUDE_PATH}/linux
+   ${JAVA_INCLUDE_PATH}/freebsd
+ )
+ 
++FIND_PATH(JAVA_INCLUDE_PATH2 jniport.h
++  ${JAVA_AWT_INCLUDE_DIRECTORIES}
++  ${JAVA_INCLUDE_PATH}
++)
++
+ FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h
+   ${JAVA_AWT_INCLUDE_DIRECTORIES}
+   ${JAVA_INCLUDE_PATH}
+@@ -169,4 +176,3 @@
+   ${JAVA_INCLUDE_PATH2}
+   ${JAVA_AWT_INCLUDE_PATH}
+ )
+-