[gentoo-commits] proj/sci:master commit in: sci-libs/vtk/files/, sci-libs/vtk/

["Justin Lecher" <jlec@gentoo.org>]

commit:     d3993511db935821b54229eb37e6af6007e29e96
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 10:46:44 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 10:46:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d3993511

Made ebuild tree ready

(Portage version: 2.2.0_alpha30/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-libs/vtk/ChangeLog                    |    4 ++
 sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch |   42 ++++++++++++++++++++
 sci-libs/vtk/vtk-5.6.1.ebuild             |   61 +++++++++++------------------
 3 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 397a606..d8f4cfb 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.78 2010/07/24 18:25:18 jlec Exp $
 
+  16 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.1.ebuild,
+  +files/vtk-5.6.1-ffmpeg.patch:
+  Made ebuild tree ready
+
   07 Mar 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.1.ebuild:
   Correct Slots for gtk 3 introduction to tree
 

diff --git a/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch
new file mode 100644
index 0000000..0a34777
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch
@@ -0,0 +1,42 @@
+ CMake/vtkFFMPEGTestAvAlloc.cxx   |    2 +-
+ CMake/vtkFFMPEGTestURLFClose.cxx |    2 +-
+ IO/vtkFFMPEGWriter.cxx           |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc.cxx
+index ad691e3..32489d5 100644
+--- a/CMake/vtkFFMPEGTestAvAlloc.cxx
++++ b/CMake/vtkFFMPEGTestAvAlloc.cxx
+@@ -1,6 +1,6 @@
+ extern "C" {
+ #ifdef HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavcodec/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif
+diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFClose.cxx
+index 0bf4314..1c10a93 100644
+--- a/CMake/vtkFFMPEGTestURLFClose.cxx
++++ b/CMake/vtkFFMPEGTestURLFClose.cxx
+@@ -1,6 +1,6 @@
+ extern "C" {
+ #ifdef HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavcodec/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif
+diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx
+index 52673ef..ffbb78f 100644
+--- a/IO/vtkFFMPEGWriter.cxx
++++ b/IO/vtkFFMPEGWriter.cxx
+@@ -22,7 +22,7 @@
+ 
+ extern "C" {
+ #ifdef VTK_FFMPEG_HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavcodec/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif

diff --git a/sci-libs/vtk/vtk-5.6.1.ebuild b/sci-libs/vtk/vtk-5.6.1.ebuild
index 0310b79..e282aff 100644
--- a/sci-libs/vtk/vtk-5.6.1.ebuild
+++ b/sci-libs/vtk/vtk-5.6.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	examples? (
 			x11-libs/qt-core:4[qt3support]
 			x11-libs/qt-gui:4[qt3support] )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( virtual/ffmpeg )
 	java? ( >=virtual/jre-1.5 )
 	mpi? ( virtual/mpi[cxx,romio] )
 	mysql? ( virtual/mysql )
@@ -38,9 +38,9 @@ RDEPEND="
 			x11-libs/qt-opengl:4
 			x11-libs/qt-sql:4
 			x11-libs/qt-webkit:4 )
-	tcl? ( >=dev-lang/tcl-8.2.3 )
+	tcl? ( dev-lang/tcl )
 	theora? ( media-libs/libtheora )
-	tk? ( >=dev-lang/tk-8.2.3 )
+	tk? ( dev-lang/tk )
 	R? ( dev-lang/R )
 	dev-libs/expat
 	dev-libs/libxml2:2
@@ -57,8 +57,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 		java? ( >=virtual/jdk-1.5 )
 		boost? ( >=dev-libs/boost-1.40.0[mpi?] )
-		mpi? ( >=dev-util/cmake-2.8.1-r2 )
-		>=dev-util/cmake-2.6"
+		dev-util/cmake"
 
 S="${WORKDIR}"/VTK
 
@@ -76,12 +75,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.6.0-cg-path.patch
-	epatch "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0-boost-property_map.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0-libpng14.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0-R.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0-odbc.patch
+	epatch \
+		"${FILESDIR}"/${PN}-5.6.0-cg-path.patch \
+		"${FILESDIR}"/${PN}-5.2.0-tcl-install.patch \
+		"${FILESDIR}"/${PN}-5.6.0-boost-property_map.patch \
+		"${FILESDIR}"/${PN}-5.6.0-libpng14.patch \
+		"${FILESDIR}"/${PN}-5.6.0-R.patch \
+		"${FILESDIR}"/${PN}-5.6.0-odbc.patch \
+		"${FILESDIR}"/${P}-ffmpeg.patch
+
 	# Fix sure buffer overflow on some processors as reported by Flameyes in #338819
 	sed -e "s:CHIPNAME_STRING_LENGTH    (48 + 1):CHIPNAME_STRING_LENGTH    (79 + 1):" \
 		-i Utilities/kwsys/SystemInformation.cxx \
@@ -199,30 +201,11 @@ src_install() {
 
 	# install examples
 	if use examples; then
-		dodir /usr/share/${PN} || \
-			die "Failed to create data/examples directory"
-
-		cp -pPR "${S}"/Examples "${D}"/usr/share/${PN}/examples || \
-			die "Failed to copy example files"
-
-		# fix example's permissions
-		find "${D}"/usr/share/${PN}/examples -type d -exec \
-			chmod 0755 {} \; || \
-			die "Failed to fix example directories permissions"
-		find "${D}"/usr/share/${PN}/examples -type f -exec \
-			chmod 0644 {} \; || \
-			die "Failed to fix example files permissions"
-
-		cp -pPR "${WORKDIR}"/VTKData "${D}"/usr/share/${PN}/data || \
-			die "Failed to copy data files"
-
-		# fix data's permissions
-		find "${D}"/usr/share/${PN}/data -type d -exec \
-			chmod 0755 {} \; || \
-			die "Failed to fix data directories permissions"
-		find "${D}"/usr/share/${PN}/data -type f -exec \
-			chmod 0644 {} \; || \
-			die "Failed to fix data files permissions"
+		insinto /usr/share/${PN}
+		mv -v Examples examples
+		doins -r examples || die
+		mv -v VTKData data || die
+		doins -r data || die
 	fi
 
 	#install big docs
@@ -235,9 +218,11 @@ src_install() {
 	fi
 
 	# environment
-	echo "VTK_DATA_ROOT=/usr/share/${PN}/data" >> "${T}"/40${PN}
-	echo "VTK_DIR=/usr/$(get_libdir)/${PN}-${SPV}" >> "${T}"/40${PN}
-	echo "VTKHOME=/usr" >> "${T}"/40${PN}
+	cat >> "${T}"/40${PN} <<- EOF
+	VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+	VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
+	VTKHOME=${EPREFIX}/usr
+	EOF
 	doenvd "${T}"/40${PN}
 }