Added ffmpeg and threads USE flags. Also, added paraview libdir to LDFLAGS.

Package-Manager: portage-2.1.2_rc1-r7

3 files changed, 35 insertions, 12 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index af22b5602f39..29026deef672 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.1 2006/10/18 17:45:29 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.2 2006/11/21 02:18:09 markusle Exp $
+
+  20 Nov 2006; Markus Dittrich <markusle@gentoo.org> paraview-2.4.4.ebuild:
+  Added ffmpeg and threads USE flags. Also, added paraview libdir
+  to LDPATH.
 
 *paraview-2.4.4 (18 Oct 2006)
 
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 0337e08c57ef..9685ba5ed144 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -7,14 +7,14 @@ MD5 6bf62cd113889c5cee8b1e3aa7043f70 files/paraview-2.4.4-png.patch 539
 RMD160 a48cfba537b2d541d3ef6826b9569e479cfc0b6b files/paraview-2.4.4-png.patch 539
 SHA256 3f7a3375432d082eb838299f5021f1591137006ea9f96b4b641dd7fef7e23414 files/paraview-2.4.4-png.patch 539
 DIST paraview-2.4.4.tar.gz 45431692 RMD160 21877872a56ffa44a5cc15232fe58bdcb4c94c2d SHA1 a5fa3263a8baf427ce0c1d587da1095e1cbb417e SHA256 2af388f046ceeff87fa6241ce91bfb55ac090c47f817486f130b7c8714aa8b1e
-EBUILD paraview-2.4.4.ebuild 2660 RMD160 a138a68a7c8b7ae68f1b7e0fbdb4307ee5a146b4 SHA1 46a8825cdf4520a03d4b0a1cc972bd7ff9326dac SHA256 52c63b89171194193051bc7916f6af79791b5a6e4790ffae6c46eec8c187f66a
-MD5 ad2068125bf20c12b51be38241cbd704 paraview-2.4.4.ebuild 2660
-RMD160 a138a68a7c8b7ae68f1b7e0fbdb4307ee5a146b4 paraview-2.4.4.ebuild 2660
-SHA256 52c63b89171194193051bc7916f6af79791b5a6e4790ffae6c46eec8c187f66a paraview-2.4.4.ebuild 2660
-MISC ChangeLog 550 RMD160 f24bf556f4343a3cc7580d90609c8c68162b1301 SHA1 03acd51f57d0f893b39d3148a5b9b4e6625e2098 SHA256 20bfcebad0019eedec9ba674167fd45082d678f48692d6308a440f6efd0004b6
-MD5 19d196c8795d213e0ef3ef52aa66a89d ChangeLog 550
-RMD160 f24bf556f4343a3cc7580d90609c8c68162b1301 ChangeLog 550
-SHA256 20bfcebad0019eedec9ba674167fd45082d678f48692d6308a440f6efd0004b6 ChangeLog 550
+EBUILD paraview-2.4.4.ebuild 3358 RMD160 adcf7a9b1657e1ca25f1c838369df55c0c93a0d8 SHA1 3006a1ecd4c48bd24e20b0cb152ad57a06c08a8a SHA256 3f3322423315f7f651a3b1879ba5eb3d7ca63fc72b536e65ab2e6c2c4d0ccb00
+MD5 008525e4b46d5f58b611b4638185ccbe paraview-2.4.4.ebuild 3358
+RMD160 adcf7a9b1657e1ca25f1c838369df55c0c93a0d8 paraview-2.4.4.ebuild 3358
+SHA256 3f3322423315f7f651a3b1879ba5eb3d7ca63fc72b536e65ab2e6c2c4d0ccb00 paraview-2.4.4.ebuild 3358
+MISC ChangeLog 706 RMD160 cc13a02a4fca6b326ccaf29844aa50d375a975e0 SHA1 677c0aa602957270afe8fc2104c9cb9dd289bf10 SHA256 5174493ed500247b69336757d499d34680580dbb24421e465829b95a8e6ecd15
+MD5 d2debbefeec28a7eab7ae523b5847e3f ChangeLog 706
+RMD160 cc13a02a4fca6b326ccaf29844aa50d375a975e0 ChangeLog 706
+SHA256 5174493ed500247b69336757d499d34680580dbb24421e465829b95a8e6ecd15 ChangeLog 706
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254
 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 metadata.xml 254
diff --git a/sci-visualization/paraview/paraview-2.4.4.ebuild b/sci-visualization/paraview/paraview-2.4.4.ebuild
index 69ddc7d6bc19..2d18f24935a7 100644
--- a/sci-visualization/paraview/paraview-2.4.4.ebuild
+++ b/sci-visualization/paraview/paraview-2.4.4.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-visualization/paraview/paraview-2.4.4.ebuild,v 1.1 2006/10/18 17:45:29 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-2.4.4.ebuild,v 1.2 2006/11/21 02:18:09 markusle Exp $
 
 inherit distutils eutils flag-o-matic toolchain-funcs versionator python
 
@@ -11,11 +11,12 @@ SRC_URI="http://www.${PN}.org/files/v2.4/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="~x86"
 SLOT="0"
-IUSE="mpi python hdf5 doc examples"
+IUSE="mpi python hdf5 doc examples ffmpeg threads"
 RDEPEND="hdf5? ( sci-libs/hdf5 )
 	doc? ( app-doc/doxygen )
 	mpi? ( sys-cluster/mpich )
 	python? ( >=dev-lang/python-2.0 )
+	ffmpeg? ( media-video/ffmpeg )
 	media-libs/libpng
 	media-libs/jpeg
 	media-libs/tiff
@@ -30,7 +31,7 @@ RDEPEND="hdf5? ( sci-libs/hdf5 )
 DEPEND="${RDEPEND}
 		>=dev-util/cmake-2.4.3"
 
-
+PVLIBDIR="$(get_libdir)/${PN}-$(get_version_component_range 1-2)"
 BUILDDIR="${WORKDIR}/build"
 
 src_unpack() {
@@ -44,6 +45,8 @@ src_unpack() {
 src_compile() {
 	cd "${BUILDDIR}"
 	local CMAKE_VARIABLES=""
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPV_INSTALL_LIB_DIR:PATH=/${PVLIBDIR}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_SKIP_RPATH:BOOL=YES"
 	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_INSTALL_PREFIX:PATH=/usr"
 	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_SHARED_LIBS:BOOL=ON"
 	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
@@ -68,6 +71,12 @@ src_compile() {
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPYTHON_LIBRARY:PATH=/usr/$(get_libdir)/libpython${PYVER}.so"
 	fi
 
+	if use ffmpeg; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_FFMPEG_ENCODER:BOOL=ON"
+	else
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_FFMPEG_ENCODER:BOOL=OFF"
+	fi
+
 	use doc && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_DOCUMENTATION:BOOL=ON"
 
 	if use examples; then
@@ -76,6 +85,12 @@ src_compile() {
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_EXAMPLES:BOOL=OFF"
 	fi
 
+	if use threads; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=ON"
+	else
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_USE_PTHREADS:BOOL=OFF"
+	fi
+
 	cmake ${CMAKE_VARIABLES} ${S} \
 		|| die "cmake configuration failed"
 
@@ -86,4 +101,8 @@ src_compile() {
 src_install() {
 	cd ${BUILDDIR}
 	make DESTDIR=${D} install || die "make install failed"
+
+	# set up the environment
+	echo "LDPATH=/usr/${PVLIBDIR}" >> ${T}/40${PN}
+	doenvd ${T}/40${PN}
 }