Gentoo Archives: gentoo-commits

From: "Markus Dittrich (markusle)" <markusle@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-visualization/paraview: ChangeLog paraview-3.6.1.ebuild
Date: Tue, 28 Jul 2009 15:16:47
Message-Id: E1MVoQ1-0003t4-Bz@stork.gentoo.org
1 markusle 09/07/28 15:16:45
2
3 Modified: ChangeLog paraview-3.6.1.ebuild
4 Log:
5 Added patch and fixes to ebuild to remove several install location snafus.
6 (Portage version: 2.1.6.13/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.39 sci-visualization/paraview/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/ChangeLog?rev=1.39&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/ChangeLog?rev=1.39&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/ChangeLog?r1=1.38&r2=1.39
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v
18 retrieving revision 1.38
19 retrieving revision 1.39
20 diff -u -r1.38 -r1.39
21 --- ChangeLog 27 Jul 2009 09:32:19 -0000 1.38
22 +++ ChangeLog 28 Jul 2009 15:16:45 -0000 1.39
23 @@ -1,6 +1,11 @@
24 # ChangeLog for sci-visualization/paraview
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.38 2009/07/27 09:32:19 markusle Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.39 2009/07/28 15:16:45 markusle Exp $
28 +
29 + 28 Jul 2009; Markus Dittrich <markusle@g.o> paraview-3.6.1.ebuild,
30 + +files/paraview-3.6.1-no-doc-finder.patch:
31 + Added patch and fixes to ebuild to remove several install location
32 + snafus.
33
34 27 Jul 2009; Markus Dittrich <markusle@g.o> paraview-3.6.1.ebuild:
35 Have paraview block vtk until a better solution is found (#279264).
36
37
38
39 1.7 sci-visualization/paraview/paraview-3.6.1.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/paraview-3.6.1.ebuild?rev=1.7&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/paraview-3.6.1.ebuild?rev=1.7&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/paraview-3.6.1.ebuild?r1=1.6&r2=1.7
44
45 Index: paraview-3.6.1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.1.ebuild,v
48 retrieving revision 1.6
49 retrieving revision 1.7
50 diff -u -r1.6 -r1.7
51 --- paraview-3.6.1.ebuild 27 Jul 2009 09:32:19 -0000 1.6
52 +++ paraview-3.6.1.ebuild 28 Jul 2009 15:16:45 -0000 1.7
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2009 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.6.1.ebuild,v 1.6 2009/07/27 09:32:19 markusle Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.1.ebuild,v 1.7 2009/07/28 15:16:45 markusle Exp $
58
59 EAPI="2"
60
61 @@ -59,6 +59,7 @@
62 epatch "${FILESDIR}"/${P}-assistant.patch
63 epatch "${DISTDIR}"/${P}-openfoam-r120.patch.bz2
64 epatch "${DISTDIR}"/${P}-openfoam-gpl-r120.patch.bz2
65 + epatch "${FILESDIR}"/${P}-no-doc-finder.patch
66
67 if use hdf5 && has_version '>=sci-libs/hdf5-1.8.0'; then
68 epatch "${FILESDIR}"/${P}-hdf-1.8.3.patch
69 @@ -69,6 +70,10 @@
70 -i VTK/Rendering/vtkOpenGLRenderWindow.cxx \
71 || die "Failed to fix GL issues."
72
73 + # fix plugin install directory
74 + sed -e "s:\${PV_INSTALL_BIN_DIR}/plugins:/usr/${PVLIBDIR}/plugins:" \
75 + -i CMake/ParaViewPlugins.cmake \
76 + || die "Failed to fix plugin install directories"
77 }
78
79 src_compile() {
80 @@ -199,6 +204,15 @@
81 # set up the environment
82 echo "LDPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN}
83 doenvd "${T}"/40${PN}
84 +
85 + # move and remove some of the files that should not be
86 + # in /usr/bin
87 + dohtml "${D}/usr/bin/about.html" && rm -f "${D}/usr/bin/about.html" \
88 + || die "Failed to move about.html into doc dir"
89 +
90 + # this binary does not work and probably should not be installed
91 + rm -f "${D}/usr/bin/vtkSMExtractDocumentation" \
92 + || die "Failed to remove vtkSMExtractDocumentation"
93 }
94
95 pkg_postinst() {