Fix dependencies for modular X and replace instances of lib with $(get_libdir).

(Portage version: 2.1_pre3-r1)

3 files changed, 18 insertions, 13 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 6f85e804fbcb..395b263ee734 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2006/01/17 21:32:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.9 2006/01/22 12:44:31 markusle Exp $
+
+  22 Jan 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
+  Fix dependencies for modular X and replace instances of lib with
+  $(get_libdir).
 
   17 Jan 2006; Markus Dittrich <markusle@gentoo.org> metadata.xml:
   Changed maintainer to Markus Dittrich <markusle@gentoo.org>.
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index a1070cab92fe..50866affb3ea 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -2,4 +2,4 @@ MD5 954996a3de59aaa2838099e5f6a9fb72 ChangeLog 1315
 MD5 4a5d51f23a583a4240e12d6d211f0c37 files/digest-vtk-4.2.6 207
 MD5 7ba663b347dd89aa7ca2f19e50641057 files/vtk-4.2.6-gcc34.patch 1739
 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254
-MD5 8f62452600958e4a4a4d4bb6d6c5511c vtk-4.2.6.ebuild 5553
+MD5 49411253b96d5027f66505e529b7aefa vtk-4.2.6.ebuild 5656
diff --git a/sci-libs/vtk/vtk-4.2.6.ebuild b/sci-libs/vtk/vtk-4.2.6.ebuild
index 06226ad24821..564d6d6d5532 100644
--- a/sci-libs/vtk/vtk-4.2.6.ebuild
+++ b/sci-libs/vtk/vtk-4.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-4.2.6.ebuild,v 1.8 2005/12/19 16:09:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-4.2.6.ebuild,v 1.9 2006/01/22 12:44:31 markusle Exp $
 
 # TODO: need to fix Examples/CMakeLists.txt to build other examples
 
@@ -28,7 +28,8 @@ RDEPEND="java? ( virtual/jdk )
 	media-libs/libpng
 	media-libs/tiff
 	virtual/opengl
-	virtual/x11"
+	|| ( x11-libs/libXmu virtual/x11 )"
+
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-1.8"
 
@@ -76,7 +77,7 @@ src_compile() {
 		python_version
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_PYTHON:BOOL=ON"
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPYTHON_INCLUDE_PATH:PATH=/usr/include/python${PYVER}"
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPYTHON_LIBRARY:PATH=/usr/lib/libpython${PYVER}.so"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPYTHON_LIBRARY:PATH=/usr/$(get_libdir)/libpython${PYVER}.so"
 	fi
 
 	use tcltk && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_TCL:BOOL=ON"
@@ -95,22 +96,22 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	# fix config file
-	sed -i -e "s:${D}:/:g" ${D}/usr/lib/${PN}/VTKConfig.cmake
+	sed -i -e "s:${D}:/:g" ${D}/usr/$(get_libdir)/${PN}/VTKConfig.cmake
 
-	LDPATH="/usr/lib/${PN}"
+	LDPATH="/usr/$(get_libdir)/${PN}"
 	# install python modules
 	if use python; then
 		distutils_python_version
-		LDPATH="${LDPATH}:/usr/lib/python${PYVER}/site-packages/${PN}_python"
+		LDPATH="${LDPATH}:/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}_python"
 		cd ${S}/Wrapping/Python
 		docinto vtk_python
 		distutils_src_install
 
 		# make symlinks to vtk python modules
-		FILES="${D}/usr/lib/vtk/libvtk*Python*.so"
+		FILES="${D}/usr/$(get_libdir)/vtk/libvtk*Python*.so"
 		for file in ${FILES}
 		do
-			dosym ${file} /usr/lib/python${PYVER}/site-packages/${PN}_python
+			dosym ${file} /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}_python
 		done
 	fi
 
@@ -142,11 +143,11 @@ src_install() {
 	# environment
 	echo "LDPATH=${LDPATH}" > ${T}/40${PN}
 	echo "VTK_DATA_ROOT=/usr/share/${PN}/data" >> ${T}/40${PN}
+	echo "LD_LIBRARY_PATH=/usr/$(get_libdir)/${PN}" >> ${T}/40${PN}
 	if use java; then
 		echo "CLASSPATH=/usr/share/${PN}/lib/${PN}.jar" >> ${T}/40${PN}
-		echo "LD_LIBRARY_PATH=/usr/lib/${PN}" >> ${T}/40${PN}
 	fi
-	use tcltk && echo "TCLLIBPATH=/usr/lib/${PN}/tcl" >> ${T}/40${PN}
+	use tcltk && echo "TCLLIBPATH=/usr/$(get_libdir)/${PN}/tcl" >> ${T}/40${PN}
 	doenvd ${T}/40${PN}
 }