Fixed wrong installation path and went back to EAPI=1 to ease installation for users of the stable branch. Also rolled back the OpenFOAM patch one version since the newer seems to cause problems.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-SENTINEL-1 i686

3 files changed, 23 insertions, 12 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 9a42fe53f996..4398d161faa3 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.27 2008/10/28 21:41:15 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.28 2008/10/30 15:34:59 markusle Exp $
+
+  30 Oct 2008; Markus Dittrich <markusle@gentoo.org> paraview-3.4.0.ebuild:
+  Fixed wrong installation path and went back to EAPI=1 to ease 
+  installation for users of the stable branch. Also rolled back the 
+  OpenFOAM patch one version since the newer seems to cause problems.
 
 *paraview-3.4.0 (28 Oct 2008)
 
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 96507ff5d680..01bd312aa7e1 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -12,11 +12,11 @@ DIST paraview-3.2.1-OpenFOAM.patch.bz2 35956 RMD160 b4f6d3f64e6a0cc952b73d70b591
 DIST paraview-3.2.1.tar.gz 21360301 RMD160 f7df024f4668901900b7633cf6dbe78337991b49 SHA1 a14e46cbeb7292f5511e1361afeb37455689c325 SHA256 d613d6a86f8a9173f42333760c9f0c29b5fcaa85554ba4b9bf61b6fddfae0cb9
 DIST paraview-3.3_pre20080514-OpenFOAM-1.5.patch.bz2 55771 RMD160 4b40990c5180157ddb7b4945d77de6f8a8ed52ee SHA1 6a673c78222e0f58c36c0d99c604216301960daf SHA256 a85a9011d67c9a3f6ed0b0f7c5c5bf6a6ade8c9989dc48a48cb552ebbed4dcd6
 DIST paraview-3.3_pre20080514.tar.bz2 19931958 RMD160 bcca09c71c84deaa721261fcb514897af052f360 SHA1 fcd8061d7a7679f635c06a1940a34d62acb77c23 SHA256 a1e75e5342bb95c18033ba2906514ba34693515b81a94d157a5928719fb9e4de
-DIST paraview-3.4.0-OpenFOAM.patch.bz2 57171 RMD160 cc3aafa33df234386adf28fb0015e37d8fcbd890 SHA1 d2e600a58d212f1505907eb59142b9996e7086f5 SHA256 976f2a8d9ba014a08bab419be3b33a9ab20bf4e9e9659ca3f74057af9f1c0a2b
+DIST paraview-3.4.0-OpenFOAM-20080728.patch.bz2 54513 RMD160 58fa24bfd2b81b2faf67d98ab1a2e1d147b0732c SHA1 ab062a3a40433cfb436d15abe595344e24cd820c SHA256 b87306d64ebddeba6bd16c83325cf9561713a30036fecfb06098b8b716ebf052
 DIST paraview-3.4.0.tar.gz 25066839 RMD160 992c90712c057e1802fb55817ca2d7d49e526afb SHA1 08aca4cac9e557b763206ba6a5496487e335bcbc SHA256 27544f442e957e9aa60b32c674f2dcd84fffeecc9a40071ef6e305333413187d
 EBUILD paraview-2.6.2.ebuild 3613 RMD160 937e650413d5fa4638b056ad88087986e59feacf SHA1 a8bc36ff2e02204585281ee7d095799eba462bbc SHA256 ce22dfad39ecc56f6618231e1771596bcef87f36cbf500b70192b6fd05b1c136
 EBUILD paraview-3.2.1.ebuild 5489 RMD160 92432a048cb9328fe9bed7c824cb8e8d16b97552 SHA1 169ac55063b2fddd349f7270b67f7871a5e499da SHA256 4536ed64e25666c4fbd68ead783d4fbb5b4c3939390413f3a17fad0425ac03af
 EBUILD paraview-3.3_pre20080514.ebuild 5811 RMD160 a9d6d865780f1186d87681bedc80e9c14183224c SHA1 98ab4cf8ed0b47678007c9d98d035c4922eeccb6 SHA256 33b3e81eec889e84fd582fe878a24664137c134d95f535ccbe6756992b348a04
-EBUILD paraview-3.4.0.ebuild 5539 RMD160 ccb928412d1b36d68ffdb218df16a3af9bd35159 SHA1 92b5f3f6b2c91d6b355bb010c694e7654e8941ac SHA256 db900b9bf1a2b47b7b628f267117e3f426d33fc8ca027a5e2530f4ac8bf1571d
-MISC ChangeLog 5450 RMD160 ea329e285b73471870821f173a2e885a01d10d4c SHA1 cc3f38067797e448fa46b4bd8016f2578ee3f248 SHA256 81894ec580a0d4655aed91b2e073b8fecf45491607d582cb48bf6a859ccfff52
+EBUILD paraview-3.4.0.ebuild 5700 RMD160 7ee8d013003454cbd9a9e44d93f3472824fb9ed5 SHA1 2b00c2e293a4a5ed446be40ecc4bb1b2af85459c SHA256 9116222d651a1aac944f67cfb20705ce3bf379ab69a7439a7ee5a763d3e84513
+MISC ChangeLog 5731 RMD160 209b14c25e37556b48405c4af6d862500143f247 SHA1 426a65efcc4119f7fd2f8a3aee17a83328c09f83 SHA256 93837a8957a85fc991519f100ed2c06f2bde9535a4b73a5c683799bcc231ad88
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
diff --git a/sci-visualization/paraview/paraview-3.4.0.ebuild b/sci-visualization/paraview/paraview-3.4.0.ebuild
index ae2463195da7..bb11f5fe82c6 100644
--- a/sci-visualization/paraview/paraview-3.4.0.ebuild
+++ b/sci-visualization/paraview/paraview-3.4.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.4.0.ebuild,v 1.1 2008/10/28 21:41:15 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.4.0.ebuild,v 1.2 2008/10/30 15:34:59 markusle Exp $
 
-EAPI="2"
+EAPI="1"
 
 inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4
 
@@ -12,7 +12,7 @@ PATCH_V="${MY_PV}_pre20080514"
 DESCRIPTION="ParaView is a powerful scientific data visualization application"
 HOMEPAGE="http://www.paraview.org"
 SRC_URI="mirror://gentoo/${P}.tar.gz
-	mirror://gentoo/${P}-OpenFOAM.patch.bz2"
+	mirror://gentoo/${P}-OpenFOAM-20080728.patch.bz2"
 
 LICENSE="paraview"
 KEYWORDS="~x86 ~amd64"
@@ -21,7 +21,7 @@ IUSE="mpi python hdf5 doc examples threads qt4"
 RDEPEND="hdf5? ( sci-libs/hdf5 )
 	mpi? ( || (
 				sys-cluster/openmpi
-				sys-cluster/mpich2[cxx] ) )
+				sys-cluster/mpich2 ) )
 	python? ( >=dev-lang/python-2.0 )
 	qt4? ( || ( ( x11-libs/qt-gui:4 x11-libs/qt-qt3support:4
 				x11-libs/qt-assistant:4 )
@@ -42,12 +42,18 @@ DEPEND="${RDEPEND}
 		doc? ( app-doc/doxygen )
 		>=dev-util/cmake-2.4.5"
 
-PVLIBDIR="$(get_libdir)/${PN}-${MY_PV}"
+PVLIBDIR="$(get_libdir)/${P}"
 BUILDDIR="${WORKDIR}/build"
 S="${WORKDIR}"/ParaView-${PV}
 
+
 pkg_setup() {
 	use qt4 && qt4_pkg_setup
+	if use mpi && has_version sys-cluster/mpich2; then
+		if ! built_with_use sys-cluster/mpich2 cxx; then
+			die "Please re-emerge sys-cluster/mpich2 with USE=\"cxx\""
+		fi
+	fi
 }
 
 src_unpack() {
@@ -56,7 +62,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-${PATCH_V}-gcc4.3.patch
 	epatch "${FILESDIR}"/${PN}-${PATCH_V}-qt4.4.patch
-	epatch "${DISTDIR}"/${P}-OpenFOAM.patch.bz2
+	epatch "${DISTDIR}"/${P}-OpenFOAM-20080728.patch.bz2
 
 	# rename paraview's assistant wrapper
 	if use qt4; then
@@ -150,12 +156,12 @@ src_install() {
 	if use qt4; then
 		mv "${D}"/usr/bin/assistant "${D}"/usr/bin/paraview-assistant \
 			|| die "Failed to rename assistant wrapper"
-		chmod 0755 "${D}"/usr/$(get_libdir)/${PN}-${MY_PV}/assistant-real \
+		chmod 0755 "${D}"/usr/${PVLIBDIR}/assistant-real \
 			|| die "Failed to change permissions on assistant wrapper"
 	fi
 
 	# add release note for the OpenFOAM-1.5 patch
-	dodoc "${S}"/ReleaseNotes_OpenFOAMReader20080831
+	dodoc "${S}"/ReleaseNotes_OpenFOAMReader20080728
 
 	# set up the environment
 	echo "LDPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN}