Added proper JAVA_AWT_LIBRARY cmake variable for amd64 platform.

Package-Manager: portage-2.1_pre7-r1

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index e82de9f78ca6f3f6c058aeee423318e0f04e69f4..6f164a3026973406027e91640d0cb0c6abc073e6 100644 (file)
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.13 2006/03/26 19:59:09 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.14 2006/03/27 16:37:41 markusle Exp $
+
+  27 Mar 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
+  Added proper JAVA_AWT_LIBRARY cmake variable for amd64 platform.
+  Thanks to Sebastiaan <s.breedveld@erasmusmc.nl> for pointing this
+  out (c.f. bug #123178).
 
   26 Mar 2006; Markus Dittrich <markusle@gentoo.org>
   +files/vtk-qt3-qt4-gentoo.patch, vtk-5.0.0.ebuild:

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 4f460880d59596c179d6a3285ca159a3cd0c5568..1268eb9086cde3586393f13b6e24e5ccab627a28 100644 (file)
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,6 +1,6 @@
-MD5 ec280c3c3c051cf94e4393dc8d207f46 ChangeLog 2427
-RMD160 535f4c3d5a3a0cb43028c7ec22eeb4e66f72b624 ChangeLog 2427
-SHA256 e6d66711f21981d550dc5b64af3e8856c5060edf60ad32f9e5c4fd5899669b54 ChangeLog 2427
+MD5 2a40532ddb601b27903b009c6e8742fd ChangeLog 2660
+RMD160 df07a1b1c3a2f89d16d70b5f0504af8d6ef913d4 ChangeLog 2660
+SHA256 ad3ebde1e31c95c250fff5701759001157dfc9839aaa09f8b9481dcfadd751f2 ChangeLog 2660
 MD5 86f6e1d7f2496767255664ba61932a73 files/digest-vtk-4.2.6 759
 RMD160 0879e3bfe67d7d6b36190d07c36078b2dcff84a7 files/digest-vtk-4.2.6 759
 SHA256 0a311502f00b1cba50cdadff5a55d329ec6fe99441e6360b6e45b580e6fc4d5d files/digest-vtk-4.2.6 759
@@ -19,6 +19,6 @@ SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701 metadata
 MD5 748f5f3854a501ae6f6e0169dbd5dbde vtk-4.2.6.ebuild 5768
 RMD160 96a37816b7b28dd87abc6389608b47e9a6a6c477 vtk-4.2.6.ebuild 5768
 SHA256 c0b6175c198c86d93fd34a4b01bfe0ab0af8efbe8884e740c389f861f836447f vtk-4.2.6.ebuild 5768
-MD5 5c457694d009301e9a1d350d7253d1e8 vtk-5.0.0.ebuild 7732
-RMD160 95723780b716b33e3d513980a7b74e94b0f92160 vtk-5.0.0.ebuild 7732
-SHA256 100d124ff5c6ef96c8e24ec1c1c04c4ab4a6158577a5b6272d70a6c82c0b2524 vtk-5.0.0.ebuild 7732
+MD5 6e34a832faa055bca452e9cf3373cc63 vtk-5.0.0.ebuild 7890
+RMD160 b04b3a1d538c74bb28fdc927692b9a25db37a5cb vtk-5.0.0.ebuild 7890
+SHA256 5d9a531f82ef058458a60c978e2f66b201ed64c58c9431415a8ecfa8599dd603 vtk-5.0.0.ebuild 7890

diff --git a/sci-libs/vtk/vtk-5.0.0.ebuild b/sci-libs/vtk/vtk-5.0.0.ebuild
index b3ab96b978ad58b8e13534dea11c2118d9372938..9fffc9f48e0f12bc2ea2c76ad433798eb599a3d3 100644 (file)
--- a/sci-libs/vtk/vtk-5.0.0.ebuild
+++ b/sci-libs/vtk/vtk-5.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.0.ebuild,v 1.3 2006/03/26 19:59:09 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.0.ebuild,v 1.4 2006/03/27 16:37:41 markusle Exp $
 
 # TODO: need to fix Examples/CMakeLists.txt to build other examples
 
@@ -76,11 +76,16 @@ src_compile() {
        use examples && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_DATA_ROOT:PATH=/usr/share/${PN}/data -DBUILD_EXAMPLES:BOOL=ON"
        if use java; then
                CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_JAVA:BOOL=ON"
-               CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so"
                CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_AWT_INCLUDE_PATH:PATH=`java-config -O`/include"
                CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_INCLUDE_PATH:PATH=`java-config -O`/include"
                CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_INCLUDE_PATH2:PATH=`java-config -O`/include/linux"
+               if [ "${ARCH}" == "amd64" ]; then
+                       CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/${ARCH}/libjawt.so"
+               else
+                       CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so"
+               fi
        fi
+
        if use mpi; then
                CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_MPI:BOOL=ON"
                use !threads && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_PARALLEL:BOOL=ON"