Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: ChangeLog vtk-5.8.0.ebuild
Date: Thu, 29 Dec 2011 11:39:31
Message-Id: 20111229113917.ADE272004B@flycatcher.gentoo.org
1 jlec 11/12/29 11:39:17
2
3 Modified: ChangeLog vtk-5.8.0.ebuild
4 Log:
5 Add missing deps for hdf5 and PyQt4/sip support
6
7 (Portage version: 2.2.0_alpha83/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.91 sci-libs/vtk/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.91&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.91&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.90&r2=1.91
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
19 retrieving revision 1.90
20 retrieving revision 1.91
21 diff -u -r1.90 -r1.91
22 --- ChangeLog 27 Dec 2011 18:52:54 -0000 1.90
23 +++ ChangeLog 29 Dec 2011 11:39:17 -0000 1.91
24 @@ -1,6 +1,9 @@
25 # ChangeLog for sci-libs/vtk
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.90 2011/12/27 18:52:54 jlec Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.91 2011/12/29 11:39:17 jlec Exp $
29 +
30 + 29 Dec 2011; Justin Lecher <jlec@g.o> vtk-5.8.0.ebuild:
31 + Add missing deps for hdf5 and PyQt4/sip support
32
33 *vtk-5.8.0 (27 Dec 2011)
34
35
36
37
38 1.2 sci-libs/vtk/vtk-5.8.0.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?r1=1.1&r2=1.2
43
44 Index: vtk-5.8.0.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- vtk-5.8.0.ebuild 27 Dec 2011 18:52:54 -0000 1.1
51 +++ vtk-5.8.0.ebuild 29 Dec 2011 11:39:17 -0000 1.2
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2011 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.1 2011/12/27 18:52:54 jlec Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.2 2011/12/29 11:39:17 jlec Exp $
57
58 EAPI=3
59
60 @@ -24,38 +24,42 @@
61 IUSE="boost cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 tk theora tk threads video_cards_nvidia R X"
62
63 RDEPEND="
64 + dev-libs/expat
65 + dev-libs/libxml2:2
66 + media-libs/freetype
67 + media-libs/libpng
68 + media-libs/mesa
69 + media-libs/tiff
70 + sci-libs/hdf5
71 + sys-libs/zlib
72 + virtual/jpeg
73 + virtual/opengl
74 + x11-libs/libX11
75 + x11-libs/libXmu
76 + x11-libs/libXt
77 cg? ( media-gfx/nvidia-cg-toolkit )
78 examples? (
79 - x11-libs/qt-core:4[qt3support]
80 - x11-libs/qt-gui:4[qt3support] )
81 + x11-libs/qt-core:4[qt3support]
82 + x11-libs/qt-gui:4[qt3support] )
83 ffmpeg? ( virtual/ffmpeg )
84 java? ( >=virtual/jre-1.5 )
85 mpi? ( virtual/mpi[cxx,romio] )
86 mysql? ( virtual/mysql )
87 odbc? ( dev-db/unixODBC )
88 postgres? ( dev-db/postgresql-base )
89 + python? ( dev-python/sip )
90 qt4? (
91 - x11-libs/qt-core:4
92 - x11-libs/qt-gui:4
93 - x11-libs/qt-opengl:4
94 - x11-libs/qt-sql:4
95 - x11-libs/qt-webkit:4 )
96 + x11-libs/qt-core:4
97 + x11-libs/qt-gui:4
98 + x11-libs/qt-opengl:4
99 + x11-libs/qt-sql:4
100 + x11-libs/qt-webkit:4
101 + python? ( dev-python/PyQt4 )
102 + )
103 tk? ( dev-lang/tk )
104 theora? ( media-libs/libtheora )
105 tk? ( dev-lang/tk )
106 - R? ( dev-lang/R )
107 - dev-libs/expat
108 - dev-libs/libxml2:2
109 - media-libs/freetype
110 - virtual/jpeg
111 - media-libs/libpng
112 - media-libs/mesa
113 - media-libs/tiff
114 - sys-libs/zlib
115 - virtual/opengl
116 - x11-libs/libX11
117 - x11-libs/libXmu
118 - x11-libs/libXt"
119 + R? ( dev-lang/R )"
120 DEPEND="${RDEPEND}
121 java? ( >=virtual/jdk-1.5 )
122 boost? ( >=dev-libs/boost-1.40.0[mpi?] )
123 @@ -63,6 +67,15 @@
124
125 S="${WORKDIR}"/VTK
126
127 +PATCHES=(
128 + "${FILESDIR}"/${PN}-5.6.0-cg-path.patch
129 + "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
130 + "${FILESDIR}"/${P}-R.patch
131 + "${FILESDIR}"/${PN}-5.6.0-odbc.patch
132 + "${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch
133 + "${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch
134 + )
135 +
136 pkg_setup() {
137 echo
138 einfo "Please note that the VTK build occasionally fails when"
139 @@ -76,21 +89,6 @@
140 append-cppflags -D__STDC_CONSTANT_MACROS
141 }
142
143 -src_prepare() {
144 - epatch \
145 - "${FILESDIR}"/${PN}-5.6.0-cg-path.patch \
146 - "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch \
147 - "${FILESDIR}"/${P}-R.patch \
148 - "${FILESDIR}"/${PN}-5.6.0-odbc.patch \
149 - "${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch \
150 - "${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch
151 -
152 - # Fix sure buffer overflow on some processors as reported by Flameyes in #338819
153 - sed -e "s:CHIPNAME_STRING_LENGTH (48 + 1):CHIPNAME_STRING_LENGTH (79 + 1):" \
154 - -i Utilities/kwsys/SystemInformation.cxx \
155 - || die "Failed to fix SystemInformation.cxx buffer overflow"
156 -}
157 -
158 src_configure() {
159 # general configuration
160 local mycmakeargs=(
161 @@ -142,12 +140,12 @@
162
163 use tk &&
164 mycmakeargs+=(
165 - VTK_WRAP_TCL
166 - VTK_WRAP_TK
167 - VTK_TCL_INCLUDE_DIR="${EPREFIX}"/usr/include
168 - VTK_TCL_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
169 - VTK_TK_INCLUDE_DIR="${EPREFIX}"/usr/include
170 - VTK_TK_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
171 + -DVTK_WRAP_TCL=ON
172 + -DVTK_WRAP_TK=ON
173 + -DVTK_TCL_INCLUDE_DIR="${EPREFIX}"/usr/include
174 + -DVTK_TCL_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
175 + -DVTK_TK_INCLUDE_DIR="${EPREFIX}"/usr/include
176 + -DVTK_TK_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
177 )
178
179 use theora &&
Report Message
Find on MARC Find on Google Groups