Added support to VTK 5.2

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1322 32389bae-6d03-0410-99cf-db05cde120eb

1 files changed, 15 insertions, 9 deletions

diff --git a/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild b/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild
index 9968c4f49..c9b04ce21 100644
--- a/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild
+++ b/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild
@@ -31,7 +31,6 @@ export OPENPBS="/usr"
 src_unpack() {
 	python_version
 	distutils_python_version
-	ewarn "Python 2.4 is highly recommended for Salome..."
 
 	if ! built_with_use sci-libs/vtk python ; then
 		die "You must rebuild sci-libs/vtk with python USE flag"
@@ -46,6 +45,21 @@ src_unpack() {
 	if version_is_at_least "4.3" $(gcc-version) ; then
 		epatch "${FILESDIR}"/${P}-gcc-4.3.patch
 	fi
+	
+	# If vtk-5.O is used, include directory is named vtk-5.0 and not vtk
+	if has_version ">=sci-libs/vtk-5.0" && has_version "<=sci-libs/vtk-5.2" ; then
+		append-flags -I/usr/include/vtk-5.0
+	fi
+	# If vtk-5.2 is used, include directory is named vtk-5.2 and not vtk
+	if has_version ">=sci-libs/vtk-5.2" ; then
+	   append-flags -I/usr/include/vtk-5.2
+	   epatch "${FILESDIR}"/${P}-vtk-5.2.patch
+	fi
+
+	# fix relocation error
+	if use amd64 ; then
+		epatch "${FILESDIR}"/${P}-amd64-relocation-error.patch
+	fi
 }
 
 
@@ -55,14 +69,6 @@ src_compile() {
 	rm -r -f autom4te.cache
 	./build_configure
 
-	# If vtk-5.O is used, include directory is named vtk-5.0 and not vtk
-	if has_version ">=sci-libs/vtk-5.0" ; then
-		einfo "vtk version 5 detected"
-		append-flags -I/usr/include/vtk-5.0
-	else
-		einfo "vtk version 4 or prior detected"
-	fi
-
 	# CXXFLAGS are slightly modified to allow the compilation of
 	# salome-visu with OpenCascade and gcc-4.1.x
 	if version_is_at_least "4.1" $(gcc-version) ; then