| 1 |
markusle 08/10/30 15:34:59 |
| 2 |
|
| 3 |
Modified: ChangeLog paraview-3.4.0.ebuild |
| 4 |
Log: |
| 5 |
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. |
| 6 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-SENTINEL-1 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.28 sci-visualization/paraview/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/ChangeLog?rev=1.28&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/ChangeLog?rev=1.28&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/ChangeLog?r1=1.27&r2=1.28 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v |
| 18 |
retrieving revision 1.27 |
| 19 |
retrieving revision 1.28 |
| 20 |
diff -u -r1.27 -r1.28 |
| 21 |
--- ChangeLog 28 Oct 2008 21:41:15 -0000 1.27 |
| 22 |
+++ ChangeLog 30 Oct 2008 15:34:59 -0000 1.28 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for sci-visualization/paraview |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.27 2008/10/28 21:41:15 markusle Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.28 2008/10/30 15:34:59 markusle Exp $ |
| 28 |
+ |
| 29 |
+ 30 Oct 2008; Markus Dittrich <markusle@g.o> paraview-3.4.0.ebuild: |
| 30 |
+ Fixed wrong installation path and went back to EAPI=1 to ease |
| 31 |
+ installation for users of the stable branch. Also rolled back the |
| 32 |
+ OpenFOAM patch one version since the newer seems to cause problems. |
| 33 |
|
| 34 |
*paraview-3.4.0 (28 Oct 2008) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 sci-visualization/paraview/paraview-3.4.0.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/paraview-3.4.0.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/paraview-3.4.0.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/paraview-3.4.0.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: paraview-3.4.0.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.4.0.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- paraview-3.4.0.ebuild 28 Oct 2008 21:41:15 -0000 1.1 |
| 52 |
+++ paraview-3.4.0.ebuild 30 Oct 2008 15:34:59 -0000 1.2 |
| 53 |
@@ -1,8 +1,8 @@ |
| 54 |
# Copyright 1999-2008 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.4.0.ebuild,v 1.1 2008/10/28 21:41:15 markusle Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.4.0.ebuild,v 1.2 2008/10/30 15:34:59 markusle Exp $ |
| 58 |
|
| 59 |
-EAPI="2" |
| 60 |
+EAPI="1" |
| 61 |
|
| 62 |
inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4 |
| 63 |
|
| 64 |
@@ -12,7 +12,7 @@ |
| 65 |
DESCRIPTION="ParaView is a powerful scientific data visualization application" |
| 66 |
HOMEPAGE="http://www.paraview.org" |
| 67 |
SRC_URI="mirror://gentoo/${P}.tar.gz |
| 68 |
- mirror://gentoo/${P}-OpenFOAM.patch.bz2" |
| 69 |
+ mirror://gentoo/${P}-OpenFOAM-20080728.patch.bz2" |
| 70 |
|
| 71 |
LICENSE="paraview" |
| 72 |
KEYWORDS="~x86 ~amd64" |
| 73 |
@@ -21,7 +21,7 @@ |
| 74 |
RDEPEND="hdf5? ( sci-libs/hdf5 ) |
| 75 |
mpi? ( || ( |
| 76 |
sys-cluster/openmpi |
| 77 |
- sys-cluster/mpich2[cxx] ) ) |
| 78 |
+ sys-cluster/mpich2 ) ) |
| 79 |
python? ( >=dev-lang/python-2.0 ) |
| 80 |
qt4? ( || ( ( x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 |
| 81 |
x11-libs/qt-assistant:4 ) |
| 82 |
@@ -42,12 +42,18 @@ |
| 83 |
doc? ( app-doc/doxygen ) |
| 84 |
>=dev-util/cmake-2.4.5" |
| 85 |
|
| 86 |
-PVLIBDIR="$(get_libdir)/${PN}-${MY_PV}" |
| 87 |
+PVLIBDIR="$(get_libdir)/${P}" |
| 88 |
BUILDDIR="${WORKDIR}/build" |
| 89 |
S="${WORKDIR}"/ParaView-${PV} |
| 90 |
|
| 91 |
+ |
| 92 |
pkg_setup() { |
| 93 |
use qt4 && qt4_pkg_setup |
| 94 |
+ if use mpi && has_version sys-cluster/mpich2; then |
| 95 |
+ if ! built_with_use sys-cluster/mpich2 cxx; then |
| 96 |
+ die "Please re-emerge sys-cluster/mpich2 with USE=\"cxx\"" |
| 97 |
+ fi |
| 98 |
+ fi |
| 99 |
} |
| 100 |
|
| 101 |
src_unpack() { |
| 102 |
@@ -56,7 +62,7 @@ |
| 103 |
cd "${S}" |
| 104 |
epatch "${FILESDIR}"/${PN}-${PATCH_V}-gcc4.3.patch |
| 105 |
epatch "${FILESDIR}"/${PN}-${PATCH_V}-qt4.4.patch |
| 106 |
- epatch "${DISTDIR}"/${P}-OpenFOAM.patch.bz2 |
| 107 |
+ epatch "${DISTDIR}"/${P}-OpenFOAM-20080728.patch.bz2 |
| 108 |
|
| 109 |
# rename paraview's assistant wrapper |
| 110 |
if use qt4; then |
| 111 |
@@ -150,12 +156,12 @@ |
| 112 |
if use qt4; then |
| 113 |
mv "${D}"/usr/bin/assistant "${D}"/usr/bin/paraview-assistant \ |
| 114 |
|| die "Failed to rename assistant wrapper" |
| 115 |
- chmod 0755 "${D}"/usr/$(get_libdir)/${PN}-${MY_PV}/assistant-real \ |
| 116 |
+ chmod 0755 "${D}"/usr/${PVLIBDIR}/assistant-real \ |
| 117 |
|| die "Failed to change permissions on assistant wrapper" |
| 118 |
fi |
| 119 |
|
| 120 |
# add release note for the OpenFOAM-1.5 patch |
| 121 |
- dodoc "${S}"/ReleaseNotes_OpenFOAMReader20080831 |
| 122 |
+ dodoc "${S}"/ReleaseNotes_OpenFOAMReader20080728 |
| 123 |
|
| 124 |
# set up the environment |
| 125 |
echo "LDPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN} |
Archives