* [gentoo-commits] proj/sci:master commit in: sci-libs/vtk/files/, sci-libs/vtk/
@ 2011-04-16 10:51 Justin Lecher
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2011-04-16 10:51 UTC (permalink / raw
To: gentoo-commits
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}
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/vtk/files/, sci-libs/vtk/
@ 2011-04-16 10:51 Justin Lecher
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2011-04-16 10:51 UTC (permalink / raw
To: gentoo-commits
commit: a991aa54202857bf1833536b5dff0097c77ebe70
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 10:50:52 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 10:50:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a991aa54
Moved to tree
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
---
sci-libs/vtk/ChangeLog | 379 --------------------
sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch | 12 -
sci-libs/vtk/files/vtk-5.6.0-R.patch | 57 ---
.../vtk/files/vtk-5.6.0-boost-property_map.patch | 13 -
sci-libs/vtk/files/vtk-5.6.0-cg-path.patch | 36 --
sci-libs/vtk/files/vtk-5.6.0-libpng14.patch | 22 --
sci-libs/vtk/files/vtk-5.6.0-odbc.patch | 12 -
sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch | 42 ---
sci-libs/vtk/metadata.xml | 20 -
sci-libs/vtk/vtk-5.6.1.ebuild | 245 -------------
10 files changed, 0 insertions(+), 838 deletions(-)
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
deleted file mode 100644
index d8f4cfb..0000000
--- a/sci-libs/vtk/ChangeLog
+++ /dev/null
@@ -1,379 +0,0 @@
-# ChangeLog for sci-libs/vtk
-# 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
-
- 31 Jan 2011; François Bissey <francois.bissey@canterbury.ac.nz>
- vtk-5.6.1.ebuild:
- change the handling of python 2.7
-
- 29 Jan 2011; François Bissey <francois.bissey@canterbury.ac.nz>
- vtk-5.6.1.ebuild:
- Complete the removal of FindPythonLibs.cmake, so we don't have a failure at
- install.
-
- 29 Dec 2010; François Bissey <f.r.bissey@massey.ac.nz> vtk-5.6.1.ebuild:
- Patch for python-2.7 as in paraview-3.8.1
-
- 09 Nov 2010; François Bissey <f.r.bissey@massey.ac.nz> vtk-5.6.1.ebuild:
- switch to virtual/jpeg
-
- 29 Oct 2010; François Bissey <f.r.bissey@massey.ac.nz>
- +files/vtk-5.2.0-tcl-install.patch:
- Readd missing patch
-
- 26 Oct 2010; François Bissey <f.r.bissey@massey.ac.nz>
- +files/vtk-5.6.0-R.patch, +files/vtk-5.6.0-boost-property_map.patch,
- +files/vtk-5.6.0-cg-path.patch, +files/vtk-5.6.0-libpng14.patch,
- +files/vtk-5.6.0-odbc.patch, +vtk-5.6.1.ebuild, +metadata.xml:
- fix silly mistake
-
- 26 Oct 2010; François Bissey <f.r.bissey@massey.ac.nz>
- +files/vtk-5.6.0-R.patch, +files/vtk-5.6.0-boost-property_map.patch,
- +files/vtk-5.6.0-cg-path.patch, +files/vtk-5.6.0-libpng14.patch,
- +files/vtk-5.6.0-odbc.patch, +vtk-5.6.1.ebuild, +metadata.xml:
- Move to qt4-r2 eclass, drop old patches.
-
-*vtk-5.6.1 (26 Oct 2010)
-
- 26 Oct 2010; François Bissey <f.r.bissey@massey.ac.nz>
- +files/vtk-5.0.3-mpi.patch, +files/vtk-5.0.4-gcc4.3.patch,
- +files/vtk-5.2.0-tcl-install.patch,
- +files/vtk-5.4.2-boost-property_map.patch, +files/vtk-5.4.2-cg-path.patch,
- +files/vtk-5.4.2-libpng14.patch, +files/vtk-5.6.0-R.patch,
- +files/vtk-5.6.0-boost-property_map.patch, +files/vtk-5.6.0-cg-path.patch,
- +files/vtk-5.6.0-libpng14.patch, +files/vtk-5.6.0-odbc.patch,
- +vtk-5.6.1.ebuild, +metadata.xml:
- Import vtk-5.6.1 in the overlay.
-
- 24 Jul 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild:
- Fix for compilation with USE=ffmpeg, #327517
-
- 11 Jul 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild,
- +files/vtk-5.6.0-odbc.patch:
- Imported support for dbs from sci overlay, 327601, thanks yFrancois Bissey
-
- 17 Jun 2010; Justin Bronder <jsbronder@gentoo.org> vtk-5.4.2-r1.ebuild:
- Remove sys-cluster/lam-mpi handling, see #324415.
-
- 09 Jun 2010; Justin Lecher <jlec@gentoo.org> -vtk-5.4.2.ebuild:
- removed old version which having problems with PYTHON ABIs stuff
-
- 07 Jun 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild:
- Fixed ogg -> theora USE transition
-
- 31 May 2010; Justin Lecher <jlec@gentoo.org> metadata.xml:
- Added myself as maintainer
-
-*vtk-5.6.0-r2 (29 May 2010)
-
- 29 May 2010; Justin Lecher <jlec@gentoo.org> -vtk-5.6.0-r1.ebuild,
- +vtk-5.6.0-r2.ebuild:
- Don't use bundled libtheora, moved USE ogg -> theora
-
- 29 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r1.ebuild:
- Added missing DEPS
-
- 29 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r1.ebuild:
- Corrected version of cmake in DEPEND for mpi
-
-*vtk-5.6.0-r1 (28 May 2010)
-
- 28 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild,
- files/vtk-5.4.2-boost-property_map.patch, -vtk-5.6.0.ebuild,
- +vtk-5.6.0-r1.ebuild, +files/vtk-5.6.0-R.patch,
- files/vtk-5.6.0-boost-property_map.patch:
- Fixed correct detection R libs
-
-*vtk-5.6.0 (28 May 2010)
-
- 28 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild,
- +vtk-5.6.0.ebuild, +files/vtk-5.6.0-boost-property_map.patch,
- +files/vtk-5.6.0-cg-path.patch, +files/vtk-5.6.0-libpng14.patch:
- Version Bump #321505; Added support for ogg R; prelimary support for
- PREFIX
-
- 22 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild,
- vtk-5.4.2-r1.ebuild:
- Add x11-libs/qt-sql to deps, #301684
-
- 25 Apr 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild:
- Python ABI fixes, #316229
-
- 26 Mar 2010; Ben de Groot <yngwin@gentoo.org> vtk-5.4.2.ebuild,
- vtk-5.4.2-r1.ebuild:
- Don't inherit unused qt3 eclass (bug #310669)
-
- 11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> vtk-5.4.2-r1.ebuild,
- +files/vtk-5.4.2-libpng14.patch:
- Fix building with libpng14.
-
- 11 Feb 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild,
- vtk-5.4.2-r1.ebuild:
- Removed qt3 support as it is no longer in the tree
-
- 21 Jan 2010; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2-r1.ebuild,
- +files/vtk-5.4.2-boost-property_map.patch:
- Added patch to allow compilation against boost-1.42 (fixes #301684).
-
- 16 Jan 2010; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2-r1.ebuild:
- Updated handling of mycmakeargs from cmake-utils.eclass.
-
-*vtk-5.4.2-r1 (19 Dec 2009)
-
- 19 Dec 2009; Markus Dittrich <markusle@gentoo.org> +vtk-5.4.2-r1.ebuild:
- New revision uses cmake-utils eclass and is significantly cleaned up.
- This should have also fixed bugs #295053 and #287591.
- Thanks much to Francois Bissey <f.r.bissey@massey.ac.nz> for his help.
-
- 17 Dec 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Updated dependency on cmake to >=2.6 (fixes bug #295531).
-
- 04 Dec 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Added short notice regarding possible parallel make issues per bug
- #244896.
-
- 24 Nov 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Removed boost from RDEPEND (fixes bug #293083).
-
- 18 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> -vtk-5.0.4.ebuild,
- -vtk-5.2.0-r1.ebuild:
- Remove old versions using built_with_use.
-
- 01 Sep 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Added missing dependency on qt-opengl (fixes bug #283181).
-
-*vtk-5.4.2 (17 Jul 2009)
-
- 17 Jul 2009; Markus Dittrich <markusle@gentoo.org> -vtk-5.0.3.ebuild,
- +files/vtk-5.4.2-cg-path.patch, +vtk-5.4.2.ebuild:
- Version bump (fixes bug #269040). Also removed old version.
-
- 27 Oct 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.2.0-r1.ebuild:
- Attempt to fix sandbox violations (see bug #244378).
-
-*vtk-5.2.0-r1 (05 Oct 2008)
-
- 05 Oct 2008; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.2.0-tcl-install.patch, -vtk-5.2.0.ebuild,
- +vtk-5.2.0-r1.ebuild:
- Fixed improper install location of support files (see bug #239553).
-
-*vtk-5.2.0 (01 Oct 2008)
-
- 01 Oct 2008; Markus Dittrich <markusle@gentoo.org> +vtk-5.2.0.ebuild:
- Version bump (fixes bug #238883). Thanks much to Steve Yin
- <steve@chinavfx.net> for his ebuild.
-
- 07 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
- Add USE flag description to metadata wrt GLEP 56.
-
- 28 Jul 2008; Carsten Lohrke <carlo@gentoo.org> vtk-5.0.3.ebuild:
- QA: Get rid of deprecated qt?_min_version().
-
- 27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> vtk-5.0.4.ebuild:
- Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
-
- 08 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> vtk-5.0.4.ebuild:
- Add a qt-gui dependency, it really is needed.
-
- 03 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> vtk-5.0.4.ebuild:
- Migrate Dependencies to permit Split QT 4.4 to satisfy dependencies, bug
- #217189
-
- 24 May 2008; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.0.4-gcc4.3.patch, vtk-5.0.4.ebuild:
- Added gcc-4.3 compatibility patch (see bug #223383). Thanks much to
- Bert Karwatzki <spasswolf@web.de> for his patch.
-
- 09 Mar 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.0.4.ebuild:
- Backported support for tcl/tk-8.5 from cvs head (fixes bug 212700).
- Thanks much to Pacho Ramos <pacho@condmat1.ciencias.uniovi.es> for
- his patch.
-
-*vtk-5.0.4 (06 Mar 2008)
-
- 06 Mar 2008; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.4.ebuild:
- Version bump.
-
- 29 Feb 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Fixed bogus install location (see bug #211819). Thanks much to
- Matthias Langer <mlangc@gmx.at> for his patch.
-
- 21 Feb 2008; Markus Dittrich <markusle@gentoo.org>
- -files/vtk-5.0.1-python2.5-gentoo.patch, -files/vtk-5.0.3-lammpi.patch,
- +files/vtk-5.0.3-mpi.patch, vtk-5.0.3.ebuild:
- Removed support for mpich and added support for mpich2, openmpi, and
- lam-mpi. Also fixed some QA issues and added qt4 eclass.
-
- 19 Aug 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Fixed incomplete RDEPEND.
-
- 01 Aug 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Added LGPL-2 to LICENSE since it is needed for gl2ps (see bug 146019).
-
- 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vtk-5.0.3.ebuild:
- Drop virtual/x11 references.
-
- 11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> -vtk-5.0.2.ebuild:
- Remove old version.
-
- 11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> vtk-5.0.3.ebuild:
- Add java? ( >=virtual/jre-1.5 ) to RDEPEND.
-
- 28 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Added VTKHOME as exported environmental variable.
-
- 08 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Re-added compile flag for javac needed on amd64 (see bug #177506).
-
- 06 May 2007; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.0.3-lammpi.patch, vtk-5.0.3.ebuild:
- Added patch fixing cmake files to properly detect and add lam-mpi
- libraries.
-
- 04 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Check for qt3support useflag when building the examples under qt4
- (see bug #176847).
-
- 01 May 2007; Markus Dittrich <markusle@gentoo.org> metadata.xml,
- vtk-5.0.3.ebuild:
- Removed explicit java CLASSPATH and added the friendly java folks
- to metadata (see bug #176547).
-
-*vtk-5.0.3 (23 Apr 2007)
-
- 23 Apr 2007; Markus Dittrich <markusle@gentoo.org>
- -files/vtk-qt-gentoo.patch, -vtk-5.0.0.ebuild, -vtk-5.0.1.ebuild,
- +vtk-5.0.3.ebuild:
- Version bump and removed old versions. Thanks much to Sebastien
- Fabbro <bicatali@gentoo.org> for his ebuild.
-
- 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> vtk-5.0.0.ebuild:
- moved from USE tcltk to tk, see bug 17808
-
-*vtk-5.0.2 (02 Dec 2006)
-
- 02 Dec 2006; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.2.ebuild:
- Version bump.
-
- 18 Nov 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.1.ebuild:
- Added -j1 back to ebuild since some people still experience problems
- with parallel builds (see discussion on bug #146767).
-
- 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> vtk-5.0.0.ebuild:
- Added call to java-pkg_pkg_setup, for bug #142708
-
- 23 Sep 2006; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.0.1-python2.5-gentoo.patch, vtk-5.0.1.ebuild:
- Added patch to fix compile problems with python-2.5
- (see bug #148727).
-
- 08 Sep 2006; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-qt-gentoo.patch, -files/vtk-qt3-qt4-gentoo.patch,
- vtk-5.0.0.ebuild, vtk-5.0.1.ebuild:
- Renamed the qt patch in an effort to get rid of the executable
- permissions. Also cleaned up the ebuilds some.
-
- 08 Sep 2006; Markus Dittrich <markusle@gentoo.org>
- files/vtk-qt3-qt4-gentoo.patch, -files/vtk-4.2.6-gcc34.patch,
- -vtk-4.2.6.ebuild:
- Removed old version since it doesn't build any more. Also fixed
- permissions for the vtk-qt patch (see bug #146826).
-
- 20 Jul 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.1.ebuild:
- Moved to new java system. Removed -j1 from emake since it works
- fine here with -j2.
-
-*vtk-5.0.1 (09 Jul 2006)
-
- 09 Jul 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild,
- vtk-5.0.0.ebuild, +vtk-5.0.1.ebuild:
- Version bump. Also, split tcltk USE flag into tcl and tk and moved
- to new style virtual/jdk.
-
- 23 Jun 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Added a warning to the ebuild that qt4 is the default in case both
- qt3 and qt4 are selected as use flags (see bug #137658).
-
- 11 Jun 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Fix RDEPEND and cmake configuration such that tcl/tk is only
- pulled in and used if USE=tcltk. This closes bug #136324.
-
- 27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest:
- Fixing SHA256 digest, pass four
-
- 21 Apr 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Depend on cmake-2.2.x to be able to properly compile against QT4.
- This fixes bug #130471.
-
- 07 Apr 2006; Markus Dittrich <markusle@gentoo.org> ChangeLog:
- Removed from package.mask after testing.
-
- 27 Mar 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Added proper JAVA_AWT_LIBRARY cmake variable for amd64 platform.
- Thanks to Sebastiaan <s.breedveld@erasmusmc.nl> for pointing this
- out (c.f. bug #123178).
-
- 26 Mar 2006; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-qt3-qt4-gentoo.patch, vtk-5.0.0.ebuild:
- Added a small fix for java compilation on amd64 as detailed
- in bug #123178. Thanks to Sebastiaan <s.breedveld@erasmusmc.nl> for
- the fix. Also enabled compilation of vtk against either QT3 or QT4.
-
- 06 Mar 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Fixed some QT3 issues and forced -j1 during emake. Thanks
- much to Sebastiaan <s.breedveld@erasmusmc.nl> for his fixes
- and testing.
-
-*vtk-5.0.0 (05 Mar 2006)
-
- 05 Mar 2006; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.0.ebuild:
- Version bump. Many thanks to Toon Verstraelen
- <Toon.Verstraelen@UGent.be> and Sebastiaan
- <s.breedveld@erasmusmc.nl> for their ebuilds and patches.
- This fixes bug #123178.
-
- 26 Feb 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Added cmake command line flag to prevent insecure RUNPATHS
- (c.f. bug #122875).
-
- 22 Jan 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Fix dependencies for modular X and replace instances of lib with
- $(get_libdir).
-
- 17 Jan 2006; Markus Dittrich <markusle@gentoo.org> metadata.xml:
- Changed maintainer to Markus Dittrich <markusle@gentoo.org>.
-
- 19 Dec 2005; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Use python eclass functions to determine installed python version.
-
- 18 Dec 2005; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Fixed compilation problems when using cmake-2.2.x and when compiling against
- python 2.4.x. Also corrected installation path of vtk jar file. This fixes
- bugs #112119, #103343, #113597.
-
- 08 Oct 2005; Thomas Matthijs <axxo@gentoo.org> vtk-4.2.6.ebuild:
- use java-pkg_dojar not dojar
-
- 24 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> vtk-4.2.6.ebuild:
- No longer using cp -a (bug #103487)
-
- 20 Aug 2005; Olivier Fisette <ribosome@gentoo.org> vtk-4.2.6.ebuild:
- Removed unused "data" USE flag (fixes bug #100418).
-
- 03 Jun 2005; Patrick Dawson <pkdawson@gentoo.org> vtk-4.2.6.ebuild:
- Typo fix.
-
-*vtk-4.2.6 (10 May 2005)
-
- 10 May 2005; Patrick Dawson <pkdawson@gentoo.org>
- +files/vtk-4.2.6-gcc34.patch, +vtk-4.2.6.ebuild:
- Initial import. See bug #25335.
-
diff --git a/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch b/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch
deleted file mode 100644
index c7da786..0000000
--- a/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur VTK/CMakeLists.txt VTK.new/CMakeLists.txt
---- VTK/CMakeLists.txt 2008-05-13 17:50:09.000000000 -0400
-+++ VTK.new/CMakeLists.txt 2008-10-05 10:34:42.000000000 -0400
-@@ -182,7 +182,7 @@
- # Compute the proper location for installing the Tcl package. This
- # must be a fixed relative path below the library install location and
- # is therefore not settable by parent projects.
--SET(VTK_INSTALL_TCL_DIR ${VTK_INSTALL_LIB_DIR})
-+SET(VTK_INSTALL_TCL_DIR ${VTK_INSTALL_PACKAGE_DIR})
-
- IF(NOT VTK_INSTALL_JAVA_DIR)
- SET(VTK_INSTALL_JAVA_DIR ${VTK_INSTALL_PACKAGE_DIR}/java)
diff --git a/sci-libs/vtk/files/vtk-5.6.0-R.patch b/sci-libs/vtk/files/vtk-5.6.0-R.patch
deleted file mode 100644
index 1327121..0000000
--- a/sci-libs/vtk/files/vtk-5.6.0-R.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/CMake/FindR.cmake b/CMake/FindR.cmake
-index ee49570..c830db0 100644
---- a/CMake/FindR.cmake
-+++ b/CMake/FindR.cmake
-@@ -18,13 +18,12 @@ IF (R_COMMAND)
- ENDIF (R_COMMAND)
- SET(CMAKE_FIND_APPBUNDLE ${TEMP_CMAKE_FIND_APPBUNDLE})
-
--FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/local/lib /usr/local/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h")
-+FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/lib /usr/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h")
- FIND_LIBRARY(R_LIBRARY_BASE R PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "R library (example libR.a, libR.dylib, etc.).")
--FIND_LIBRARY(R_LIBRARY_BLAS Rblas PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rblas library (example libRblas.a, libRblas.dylib, etc.).")
--FIND_LIBRARY(R_LIBRARY_LAPACK Rlapack PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rlapack library (example libRlapack.a, libRlapack.dylib, etc.).")
-+FIND_LIBRARY(R_LIBRARY_MATH Rmath PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rmath library (example libRmath.a, libRmath.dylib, etc.).")
- FIND_LIBRARY(R_LIBRARY_READLINE readline DOC "(Optional) system readline library. Only required if the R libraries were build with readline support.")
-
--SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_BLAS} ${R_LIBRARY_LAPACK} ${R_LIBRARY_BASE})
-+SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_MATH} ${R_LIBRARY_BASE})
- IF (R_LIBRARY_READLINE)
- SET(R_LIBRARIES ${R_LIBRARIES} ${R_LIBRARY_READLINE})
- ENDIF (R_LIBRARY_READLINE)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9d4e881..1a828a4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1054,8 +1054,18 @@ IF(VTK_WRAP_JAVA)
- ENDIF(JAVA_AWT_LIBRARY)
- ENDIF(VTK_WRAP_JAVA)
-
-+IF(VTK_USE_GNU_R)
-+ FIND_PACKAGE(R)
-+ENDIF(VTK_USE_GNU_R)
-
--
-+IF(VTK_USE_BOOST)
-+ if (VTK_USE_PARALLEL_BGL)
-+ FIND_PACKAGE(Boost 1.39.0 REQUIRED
-+ COMPONENTS mpi serialization filesystem system graph_parallel)
-+ else (VTK_USE_PARALLEL_BGL)
-+ FIND_PACKAGE(Boost REQUIRED)
-+ endif (VTK_USE_PARALLEL_BGL)
-+ENDIF(VTK_USE_BOOST)
- #-----------------------------------------------------------------------------
- # The entire VTK tree should use the same include path.
-
-diff --git a/Graphics/vtkRInterface.cxx b/Graphics/vtkRInterface.cxx
-index 324e845..56a4869 100644
---- a/Graphics/vtkRInterface.cxx
-+++ b/Graphics/vtkRInterface.cxx
-@@ -23,6 +23,7 @@
- #undef HAVE_UINTPTR_T
- #ifdef HAVE_VTK_UINTPTR_T
- #define HAVE_UINTPTR_T HAVE_VTK_UINTPTR_T
-+#include <stdint.h>
- #endif
-
- #include "vtkInformation.h"
diff --git a/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch b/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch
deleted file mode 100644
index 9319378..0000000
--- a/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx
-index 4a764ea..74d0b53 100644
---- a/Infovis/vtkTreeLayoutStrategy.cxx
-+++ b/Infovis/vtkTreeLayoutStrategy.cxx
-@@ -388,7 +388,7 @@ void vtkTreeLayoutStrategy::PrintSelf(ostream& os, vtkIndent indent)
- #include "vtkTreeToBoostAdapter.h"
- #include <boost/graph/visitors.hpp>
- #include <boost/graph/depth_first_search.hpp>
--#include <boost/property_map.hpp>
-+#include <boost/property_map/property_map.hpp>
- #include <boost/pending/queue.hpp>
-
- using namespace boost;
diff --git a/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch b/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch
deleted file mode 100644
index 984bf50..0000000
--- a/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/CMake/FindCg.cmake b/CMake/FindCg.cmake
-index ceb41de..5eb6003 100644
---- a/CMake/FindCg.cmake
-+++ b/CMake/FindCg.cmake
-@@ -82,6 +82,7 @@ ELSE (APPLE)
- FIND_PROGRAM( CG_COMPILER cgc
- /usr/bin
- /usr/local/bin
-+ /opt/nvidia-cg-toolkit/bin
- DOC "The Cg Compiler"
- )
- GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH)
-@@ -89,6 +90,7 @@ ELSE (APPLE)
- FIND_PATH( CG_INCLUDE_PATH Cg/cg.h
- /usr/include
- /usr/local/include
-+ /opt/nvidia-cg-toolkit/include
- ${CG_COMPILER_SUPER_DIR}/include
- DOC "The directory where Cg/cg.h resides"
- )
-@@ -98,6 +100,7 @@ ELSE (APPLE)
- /usr/lib
- /usr/local/lib64
- /usr/local/lib
-+ /opt/nvidia-cg-toolkit/lib
- ${CG_COMPILER_SUPER_DIR}/lib64
- ${CG_COMPILER_SUPER_DIR}/lib
- DOC "The Cg runtime library"
-@@ -108,6 +111,7 @@ ELSE (APPLE)
- /usr/lib
- /usr/local/lib64
- /usr/local/lib
-+ /opt/nvidia-cg-toolkit/lib
- ${CG_COMPILER_SUPER_DIR}/lib64
- ${CG_COMPILER_SUPER_DIR}/lib
- DOC "The Cg runtime library"
diff --git a/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch b/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch
deleted file mode 100644
index db1f87d..0000000
--- a/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/IO/vtkPNGReader.cxx b/IO/vtkPNGReader.cxx
-index d1f5c2f..0bf00e4 100644
---- a/IO/vtkPNGReader.cxx
-+++ b/IO/vtkPNGReader.cxx
-@@ -116,7 +116,7 @@ void vtkPNGReader::ExecuteInformation()
- // minimum of a byte per pixel
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
- {
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- }
-
- // add alpha if any alpha found
-@@ -225,7 +225,7 @@ void vtkPNGReaderUpdate2(vtkPNGReader *self, OT *outPtr,
- // minimum of a byte per pixel
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
- {
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- }
-
- // add alpha if any alpha found
diff --git a/sci-libs/vtk/files/vtk-5.6.0-odbc.patch b/sci-libs/vtk/files/vtk-5.6.0-odbc.patch
deleted file mode 100644
index be24af1..0000000
--- a/sci-libs/vtk/files/vtk-5.6.0-odbc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur CMake/FindODBC.cmake.orig CMake/FindODBC.cmake
---- CMake/FindODBC.cmake.orig 2008-10-08 13:51:36.000000000 -0400
-+++ CMake/FindODBC.cmake 2010-01-21 22:11:26.000000000 -0500
-@@ -30,7 +30,7 @@
- )
-
- FIND_LIBRARY( ODBC_LIBRARY
-- NAMES iodbc unixodbc
-+ NAMES iodbc unixodbc odbc
- PATHS
- /usr/lib
- /usr/lib/odbc
diff --git a/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch
deleted file mode 100644
index 0a34777..0000000
--- a/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- 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/metadata.xml b/sci-libs/vtk/metadata.xml
deleted file mode 100644
index 4671a1c..0000000
--- a/sci-libs/vtk/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<herd>java</herd>
-<maintainer>
- <email>markusle@gentoo.org</email>
- <name>Markus Dittrich</name>
-</maintainer>
-<maintainer>
- <email>jlec@gentoo.org</email>
- <name>Justin Lecher</name>
-</maintainer>
-<use>
- <flag name='boost'>Add support for boost</flag>
- <flag name='cg'>Use nvidia's cg shaders</flag>
- <flag name='patented'>Build patented classes</flag>
- <flag name='R'>Enable support for dev-lang/R</flag>
-</use>
-</pkgmetadata>
diff --git a/sci-libs/vtk/vtk-5.6.1.ebuild b/sci-libs/vtk/vtk-5.6.1.ebuild
deleted file mode 100644
index e282aff..0000000
--- a/sci-libs/vtk/vtk-5.6.1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-
-inherit eutils flag-o-matic java-pkg-opt-2 python qt4-r2 versionator toolchain-funcs cmake-utils
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="http://www.vtk.org"
-SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
- examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz )
- doc? ( http://www.${PN}.org/doc/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="boost cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 tcl theora tk threads R"
-RDEPEND="
- cg? ( media-gfx/nvidia-cg-toolkit )
- examples? (
- x11-libs/qt-core:4[qt3support]
- x11-libs/qt-gui:4[qt3support] )
- ffmpeg? ( virtual/ffmpeg )
- java? ( >=virtual/jre-1.5 )
- mpi? ( virtual/mpi[cxx,romio] )
- mysql? ( virtual/mysql )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql-base )
- qt4? (
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- x11-libs/qt-opengl:4
- x11-libs/qt-sql:4
- x11-libs/qt-webkit:4 )
- tcl? ( dev-lang/tcl )
- theora? ( media-libs/libtheora )
- tk? ( dev-lang/tk )
- R? ( dev-lang/R )
- dev-libs/expat
- dev-libs/libxml2:2
- media-libs/freetype
- virtual/jpeg
- media-libs/libpng
- media-libs/mesa
- media-libs/tiff
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXt"
-DEPEND="${RDEPEND}
- java? ( >=virtual/jdk-1.5 )
- boost? ( >=dev-libs/boost-1.40.0[mpi?] )
- dev-util/cmake"
-
-S="${WORKDIR}"/VTK
-
-pkg_setup() {
- echo
- einfo "Please note that the VTK build occasionally fails when"
- einfo "using parallel make. Hence, if you experience a build"
- einfo "failure please try re-emerging with MAKEOPTS=\"-j1\" first."
- echo
-
- java-pkg-opt-2_pkg_setup
-
- use python && python_set_active_version 2
- append-cppflags -D__STDC_CONSTANT_MACROS
-}
-
-src_prepare() {
- 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 \
- || die "Failed to fix SystemInformation.cxx buffer overflow"
- sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
- -i Wrapping/Tcl/pkgIndex.tcl.in \
- || die "Failed to fix tcl pkgIndex file"
- # Patch FindPythonLibs.cmake for python-2.7, removing it does more harm than good.
- sed -e "s:2.6 2.5 2.4 2.3 2.2 2.1 2.0:2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0:" \
- -i CMake/FindPythonLibs.cmake || die "failed to patch for python 2.7"
-}
-
-src_configure() {
- # general configuration
- local mycmakeargs=(
- -Wno-dev
- -DVTK_INSTALL_PACKAGE_DIR=/$(get_libdir)/${PN}-${SPV}
- -DCMAKE_SKIP_RPATH=YES
- -DVTK_DIR="${S}"
- -DVTK_INSTALL_LIB_DIR=/$(get_libdir)/
- -DVTK_DATA_ROOT:PATH="${EPREFIX}"/usr/share/${PN}/data
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DBUILD_SHARED_LIBS=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_SYSTEM_PNG=ON
- -DVTK_USE_SYSTEM_TIFF=ON
- -DVTK_USE_SYSTEM_ZLIB=ON
- -DBUILD_TESTING=OFF
- -DBUILD_EXAMPLES=OFF
- -DVTK_USE_HYBRID=ON
- -DVTK_USE_GL2PS=ON
- -DVTK_USE_RENDERING=ON)
-
- # use flag triggered options
- mycmakeargs+=(
- $(cmake-utils_use boost VTK_USE_BOOST)
- $(cmake-utils_use cg VTK_USE_CG_SHADERS)
- $(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
- $(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use java VTK_USE_JAVA)
- $(cmake-utils_use mpi VTK_USE_MPI)
- $(cmake-utils_use patented VTK_USE_PATENTED)
- $(cmake-utils_use qt4 VTK_USE_QT)
- $(cmake-utils_use tcl VTK_WRAP_TCL)
- $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER)
- $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
- $(cmake-utils_use tk VTK_USE_TK)
- $(cmake-utils_use threads VTK_USE_PARALLEL)
- $(cmake-utils_use R VTK_USE_GNU_R)
- $(cmake-utils_use mysql VTK_USE_MYSQL)
- $(cmake-utils_use postgres VTK_USE_POSTGRES)
- $(cmake-utils_use odbc VTK_USE_ODBC) )
-
- use theora &&
- mycmakeargs+=(-DVTK_USE_SYSTEM_OGGTHEORA=ON)
-
- # mpi needs the parallel framework
- if use mpi && use !threads; then
- mycmakeargs+=(-DVTK_USE_PARALLEL=ON)
- fi
-
- if use java; then
- mycmakeargs+=(
- -DVTK_WRAP_JAVA=ON
- -DJAVA_AWT_INCLUDE_PATH=`java-config -O`/include
- -DJAVA_INCLUDE_PATH:PATH=`java-config -O`/include
- -DJAVA_INCLUDE_PATH2:PATH=`java-config -O`/include/linux)
-
- if [ "${ARCH}" == "amd64" ]; then
- mycmakeargs+=(-DJAVA_AWT_LIBRARY=`java-config -O`/jre/lib/${ARCH}/libjawt.so)
- else
- mycmakeargs+=(-DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so)
- fi
- fi
-
- if use python; then
- mycmakeargs+=(
- -DVTK_WRAP_PYTHON=ON
- -DPYTHON_INCLUDE_PATH=$(python_get_includedir)
- -DPYTHON_LIBRARY=$(python_get_library)
- -DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}")
- fi
-
- if use qt4 ; then
- mycmakeargs+=(
- -DVTK_USE_GUISUPPORT=ON
- -DVTK_USE_QVTK=ON
- -DVTK_USE_QVTK_QTOPENGL=ON
- -DQT_WRAP_CPP=ON
- -DQT_WRAP_UI=ON
- -DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN}
- -DDESIRED_QT_VERSION=4
- -DQT_MOC_EXECUTABLE="${EPREFIX}"/usr/bin/moc
- -DQT_UIC_EXECUTABLE="${EPREFIX}"/usr/bin/uic
- -DQT_INCLUDE_DIR="${EPREFIX}"/usr/include/qt4
- -DQT_QMAKE_EXECUTABLE="${EPREFIX}"/usr/bin/qmake)
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # install docs
- dohtml "${S}"/README.html || die "Failed to install docs"
-
- # install Tcl docs
- docinto vtk_tcl
- dodoc "${S}"/Wrapping/Tcl/README || \
- die "Failed to install Tcl docs"
-
- # install examples
- if use examples; then
- 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
- if use doc; then
- cd "${WORKDIR}"/html
- rm -f *.md5 || die "Failed to remove superfluous hashes"
- einfo "Installing API docs. This may take some time."
- insinto "/usr/share/doc/${PF}/api-docs"
- doins -r ./* || die "Failed to install docs"
- fi
-
- # environment
- 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}
-}
-
-pkg_postinst() {
- if use patented; then
- ewarn "Using patented code in VTK may require a license."
- ewarn "For more information, please read:"
- ewarn "http://public.kitware.com/cgi-bin/vtkfaq?req=show&file=faq07.005.htp"
- fi
-
- if use python; then
- python_mod_optimize vtk
- fi
-}
-
-pkg_postrm() {
- if use python; then
- python_mod_cleanup vtk
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/vtk/files/, sci-libs/vtk/
@ 2013-07-17 17:59 Sebastien Fabbro
0 siblings, 0 replies; 5+ messages in thread
From: Sebastien Fabbro @ 2013-07-17 17:59 UTC (permalink / raw
To: gentoo-commits
commit: f8b1e8935b05584228582da19f9c17a36dd952c5
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 13:13:36 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 13:13:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f8b1e893
Dropped again, because still not working
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
---
sci-libs/vtk/ChangeLog | 484 -----------------------------
sci-libs/vtk/files/vtk-6.0.0-cg-path.patch | 16 -
sci-libs/vtk/metadata.xml | 18 --
sci-libs/vtk/vtk-6.0.0.ebuild | 279 -----------------
4 files changed, 797 deletions(-)
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
deleted file mode 100644
index 593ce9f..0000000
--- a/sci-libs/vtk/ChangeLog
+++ /dev/null
@@ -1,484 +0,0 @@
-# ChangeLog for sci-libs/vtk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.108 2013/06/05 01:21:35 lu_zero Exp $
-
- 16 Jul 2013; Justin Lecher <jlec@gentoo.org> vtk-6.0.0.ebuild,
- -files/vtk-5.2.0-tcl-install.patch,
- -files/vtk-5.4.2-boost-property_map.patch, -files/vtk-5.4.2-cg-path.patch,
- -files/vtk-5.4.2-libpng14.patch, -files/vtk-5.6.0-R.patch,
- -files/vtk-5.6.0-boost-property_map.patch, -files/vtk-5.6.0-cg-path.patch,
- -files/vtk-5.6.0-ffmpeg.patch, -files/vtk-5.6.0-libpng14.patch,
- -files/vtk-5.6.0-odbc.patch, -files/vtk-5.6.1-ffmpeg.patch,
- -files/vtk-5.6.1-gcc-46.patch, -files/vtk-5.6.1-libav-0.8.patch,
- -files/vtk-5.6.1-libpng15.patch, -files/vtk-5.8.0-R.patch,
- -files/vtk-5.8.0-boost.patch, -files/vtk-5.10.1-ffmpeg-1.patch,
- -files/vtk-5.10.1-libav-9.patch, -files/vtk-5.10.1-tcl8.6.patch,
- metadata.xml:
- Version BUmp
-
-*vtk-6.0.0 (11 Jul 2013)
-
- 11 Jul 2013; Justin Lecher <jlec@gentoo.org> +vtk-6.0.0.ebuild,
- +files/vtk-5.2.0-tcl-install.patch,
- +files/vtk-5.4.2-boost-property_map.patch, +files/vtk-5.4.2-cg-path.patch,
- +files/vtk-5.4.2-libpng14.patch, +files/vtk-5.6.0-R.patch,
- +files/vtk-5.6.0-boost-property_map.patch, +files/vtk-5.6.0-cg-path.patch,
- +files/vtk-5.6.0-ffmpeg.patch, +files/vtk-5.6.0-libpng14.patch,
- +files/vtk-5.6.0-odbc.patch, +files/vtk-5.6.1-ffmpeg.patch,
- +files/vtk-5.6.1-gcc-46.patch, +files/vtk-5.6.1-libav-0.8.patch,
- +files/vtk-5.6.1-libpng15.patch, +files/vtk-5.8.0-R.patch,
- +files/vtk-5.8.0-boost.patch, +files/vtk-5.10.1-ffmpeg-1.patch,
- +files/vtk-5.10.1-libav-9.patch, +files/vtk-5.10.1-tcl8.6.patch,
- +files/vtk-6.0.0-cg-path.patch, +metadata.xml:
- First working version
-
- 05 Jun 2013; Luca Barbato <lu_zero@gentoo.org> vtk-5.10.1.ebuild,
- +files/vtk-5.10.1-libav-9.patch:
- libav 9 (and upcoming 10) support.
-
- 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> vtk-5.10.0.ebuild,
- vtk-5.10.1.ebuild:
- Move Qt dependencies to the new category
-
- 31 Jan 2013; Justin Lecher <jlec@gentoo.org> files/vtk-5.10.1-tcl8.6.patch:
- Backport upstream patch for tcl/tk-8.6.0, #454762
-
- 17 Jan 2013; Alexis Ballier <aballier@gentoo.org> vtk-5.10.1.ebuild,
- +files/vtk-5.10.1-ffmpeg-1.patch:
- Fix build with latest ffmpeg. Part of bug #450464.
-
- 15 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild,
- +files/vtk-5.10.1-tcl8.6.patch:
- Better fix for tcl support
-
- 14 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild:
- Solve problems with USE=examples, #447146
-
- 10 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild:
- Add compatibility fix for tcl8.6
-
-*vtk-5.10.1 (13 Dec 2012)
-
- 13 Dec 2012; Justin Lecher <jlec@gentoo.org> +vtk-5.10.1.ebuild,
- metadata.xml:
- Version Bump
-
- 06 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> vtk-5.10.0.ebuild:
- Keyword amd64-linux and x86-linux
-
- 04 Sep 2012; Justin Lecher <jlec@gentoo.org> -vtk-5.6.1.ebuild,
- -vtk-5.8.0.ebuild:
- Drop old
-
-*vtk-5.10.0 (07 Jun 2012)
-
- 07 Jun 2012; Justin Lecher <jlec@gentoo.org> files/vtk-5.8.0-boost.patch,
- +vtk-5.10.0.ebuild, metadata.xml:
- Version Bump, #420103; Update boost patch, #412945
-
- 20 Mar 2012; Jeroen Roovers <jer@gentoo.org> vtk-5.8.0.ebuild:
- Sort IUSE entries. Remove IUSE=tk duplicate by zvasylvv (bug #408871).
-
- 27 Feb 2012; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild:
- Fix typo in Changelog and commit fix for #401839
-
- 13 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> vtk-5.8.0.ebuild:
- Add missing dependency on media-video/nvidia-settings
-
- 10 Feb 2012; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild,
- +files/vtk-5.8.0-boost.patch:
- Backport patch for boost-1.48, #400901
-
- 10 Feb 2012; Justin Lecher <jlec@gentoo.org> -vtk-5.4.2-r1.ebuild,
- -vtk-5.6.0-r2.ebuild, -vtk-5.6.0-r3.ebuild, vtk-5.6.1.ebuild,
- vtk-5.8.0.ebuild:
- Use selected python ABI, #401839, patch by JTRiley; dropped old
-
- 29 Dec 2011; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild:
- Correct PYTHON_SETUP_ARGS to VTK_PYTHON_SETUP_ARGS, #396297
-
- 29 Dec 2011; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild:
- Add missing deps for hdf5 and PyQt4/sip support
-
-*vtk-5.8.0 (27 Dec 2011)
-
- 27 Dec 2011; Justin Lecher <jlec@gentoo.org> +vtk-5.8.0.ebuild,
- +files/vtk-5.8.0-R.patch:
- Version Bump, #396119
-
- 16 Nov 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.1.ebuild,
- +files/vtk-5.6.1-libav-0.8.patch, metadata.xml:
- Add debian patch for building against libav-0.8, #380681
-
- 13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> vtk-5.6.1.ebuild,
- +files/vtk-5.6.1-libpng15.patch:
- Fix building with libpng15 wrt #378393 by Diego Elio Pettenò
-
- 04 Aug 2011; Fabian Groffen <grobian@gentoo.org> vtk-5.6.1.ebuild:
- Allow to find Python from Prefix, bug #376917
-
- 20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
- Drop maintainer due retirement, bug #105599
-
- 25 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild,
- vtk-5.6.0-r3.ebuild, vtk-5.6.1.ebuild, files/vtk-5.6.1-ffmpeg.patch,
- +files/vtk-5.6.1-gcc-46.patch:
- Correct patch for USE=ffmpeg, 327957; Fix for gcc-4.6
-
- 17 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r3.ebuild,
- vtk-5.6.1.ebuild:
- Fix ofr installation of examples, #363919
-
-*vtk-5.6.1 (16 Apr 2011)
-*vtk-5.6.0-r3 (16 Apr 2011)
-
- 16 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild,
- +vtk-5.6.0-r3.ebuild, +files/vtk-5.6.0-ffmpeg.patch, +vtk-5.6.1.ebuild,
- +files/vtk-5.6.1-ffmpeg.patch:
- Version Bump, Fixes for ffmpeg, Fortify source, py-2.7; #362701, #350318,
- #344065, #338819, #334705, #327957
-
- 31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> vtk-5.6.0-r2.ebuild:
- Depend on virtual/ffmpeg instead of media-video/ffmpeg.
-
- 02 Mar 2011; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild,
- vtk-5.6.0-r2.ebuild:
- Correct Slots for gtk 3 introduction to tree
-
- 09 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> +vtk-5.4.2-r1.ebuild,
- +files/vtk-5.4.2-boost-property_map.patch, +files/vtk-5.4.2-cg-path.patch,
- +files/vtk-5.4.2-libpng14.patch:
- Bring back vtk-5.4.x as sci-visualization/mayavi:1 depends on it.
- media-libs/jpeg -> virtual/jpeg
-
- 08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
- -files/vtk-5.0.3-mpi.patch, -files/vtk-5.0.4-gcc4.3.patch,
- -vtk-5.4.2-r1.ebuild, -files/vtk-5.4.2-boost-property_map.patch,
- -files/vtk-5.4.2-cg-path.patch, -files/vtk-5.4.2-libpng14.patch,
- vtk-5.6.0-r2.ebuild:
- media-libs/jpeg -> virtual/jpeg. Drop old.
-
- 24 Jul 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild:
- Fix for compilation with USE=ffmpeg, #327517
-
- 11 Jul 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild,
- +files/vtk-5.6.0-odbc.patch:
- Imported support for dbs from sci overlay, 327601, thanks yFrancois Bissey
-
- 17 Jun 2010; Justin Bronder <jsbronder@gentoo.org> vtk-5.4.2-r1.ebuild:
- Remove sys-cluster/lam-mpi handling, see #324415.
-
- 09 Jun 2010; Justin Lecher <jlec@gentoo.org> -vtk-5.4.2.ebuild:
- removed old version which having problems with PYTHON ABIs stuff
-
- 07 Jun 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild:
- Fixed ogg -> theora USE transition
-
- 31 May 2010; Justin Lecher <jlec@gentoo.org> metadata.xml:
- Added myself as maintainer
-
-*vtk-5.6.0-r2 (29 May 2010)
-
- 29 May 2010; Justin Lecher <jlec@gentoo.org> -vtk-5.6.0-r1.ebuild,
- +vtk-5.6.0-r2.ebuild:
- Don't use bundled libtheora, moved USE ogg -> theora
-
- 29 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r1.ebuild:
- Added missing DEPS
-
- 29 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r1.ebuild:
- Corrected version of cmake in DEPEND for mpi
-
-*vtk-5.6.0-r1 (28 May 2010)
-
- 28 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild,
- files/vtk-5.4.2-boost-property_map.patch, -vtk-5.6.0.ebuild,
- +vtk-5.6.0-r1.ebuild, +files/vtk-5.6.0-R.patch,
- files/vtk-5.6.0-boost-property_map.patch:
- Fixed correct detection R libs
-
-*vtk-5.6.0 (28 May 2010)
-
- 28 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild,
- +vtk-5.6.0.ebuild, +files/vtk-5.6.0-boost-property_map.patch,
- +files/vtk-5.6.0-cg-path.patch, +files/vtk-5.6.0-libpng14.patch:
- Version Bump #321505; Added support for ogg R; prelimary support for
- PREFIX
-
- 22 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild,
- vtk-5.4.2-r1.ebuild:
- Add x11-libs/qt-sql to deps, #301684
-
- 25 Apr 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild:
- Python ABI fixes, #316229
-
- 26 Mar 2010; Ben de Groot <yngwin@gentoo.org> vtk-5.4.2.ebuild,
- vtk-5.4.2-r1.ebuild:
- Don't inherit unused qt3 eclass (bug #310669)
-
- 11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> vtk-5.4.2-r1.ebuild,
- +files/vtk-5.4.2-libpng14.patch:
- Fix building with libpng14.
-
- 11 Feb 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild,
- vtk-5.4.2-r1.ebuild:
- Removed qt3 support as it is no longer in the tree
-
- 21 Jan 2010; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2-r1.ebuild,
- +files/vtk-5.4.2-boost-property_map.patch:
- Added patch to allow compilation against boost-1.42 (fixes #301684).
-
- 16 Jan 2010; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2-r1.ebuild:
- Updated handling of mycmakeargs from cmake-utils.eclass.
-
-*vtk-5.4.2-r1 (19 Dec 2009)
-
- 19 Dec 2009; Markus Dittrich <markusle@gentoo.org> +vtk-5.4.2-r1.ebuild:
- New revision uses cmake-utils eclass and is significantly cleaned up.
- This should have also fixed bugs #295053 and #287591.
- Thanks much to Francois Bissey <f.r.bissey@massey.ac.nz> for his help.
-
- 17 Dec 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Updated dependency on cmake to >=2.6 (fixes bug #295531).
-
- 04 Dec 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Added short notice regarding possible parallel make issues per bug
- #244896.
-
- 24 Nov 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Removed boost from RDEPEND (fixes bug #293083).
-
- 18 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> -vtk-5.0.4.ebuild,
- -vtk-5.2.0-r1.ebuild:
- Remove old versions using built_with_use.
-
- 01 Sep 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Added missing dependency on qt-opengl (fixes bug #283181).
-
-*vtk-5.4.2 (17 Jul 2009)
-
- 17 Jul 2009; Markus Dittrich <markusle@gentoo.org> -vtk-5.0.3.ebuild,
- +files/vtk-5.4.2-cg-path.patch, +vtk-5.4.2.ebuild:
- Version bump (fixes bug #269040). Also removed old version.
-
- 27 Oct 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.2.0-r1.ebuild:
- Attempt to fix sandbox violations (see bug #244378).
-
-*vtk-5.2.0-r1 (05 Oct 2008)
-
- 05 Oct 2008; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.2.0-tcl-install.patch, -vtk-5.2.0.ebuild,
- +vtk-5.2.0-r1.ebuild:
- Fixed improper install location of support files (see bug #239553).
-
-*vtk-5.2.0 (01 Oct 2008)
-
- 01 Oct 2008; Markus Dittrich <markusle@gentoo.org> +vtk-5.2.0.ebuild:
- Version bump (fixes bug #238883). Thanks much to Steve Yin
- <steve@chinavfx.net> for his ebuild.
-
- 07 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
- Add USE flag description to metadata wrt GLEP 56.
-
- 28 Jul 2008; Carsten Lohrke <carlo@gentoo.org> vtk-5.0.3.ebuild:
- QA: Get rid of deprecated qt?_min_version().
-
- 27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> vtk-5.0.4.ebuild:
- Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
-
- 08 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> vtk-5.0.4.ebuild:
- Add a qt-gui dependency, it really is needed.
-
- 03 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> vtk-5.0.4.ebuild:
- Migrate Dependencies to permit Split QT 4.4 to satisfy dependencies, bug
- #217189
-
- 24 May 2008; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.0.4-gcc4.3.patch, vtk-5.0.4.ebuild:
- Added gcc-4.3 compatibility patch (see bug #223383). Thanks much to
- Bert Karwatzki <spasswolf@web.de> for his patch.
-
- 09 Mar 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.0.4.ebuild:
- Backported support for tcl/tk-8.5 from cvs head (fixes bug 212700).
- Thanks much to Pacho Ramos <pacho@condmat1.ciencias.uniovi.es> for
- his patch.
-
-*vtk-5.0.4 (06 Mar 2008)
-
- 06 Mar 2008; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.4.ebuild:
- Version bump.
-
- 29 Feb 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Fixed bogus install location (see bug #211819). Thanks much to
- Matthias Langer <mlangc@gmx.at> for his patch.
-
- 21 Feb 2008; Markus Dittrich <markusle@gentoo.org>
- -files/vtk-5.0.1-python2.5-gentoo.patch, -files/vtk-5.0.3-lammpi.patch,
- +files/vtk-5.0.3-mpi.patch, vtk-5.0.3.ebuild:
- Removed support for mpich and added support for mpich2, openmpi, and
- lam-mpi. Also fixed some QA issues and added qt4 eclass.
-
- 19 Aug 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Fixed incomplete RDEPEND.
-
- 01 Aug 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Added LGPL-2 to LICENSE since it is needed for gl2ps (see bug 146019).
-
- 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vtk-5.0.3.ebuild:
- Drop virtual/x11 references.
-
- 11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> -vtk-5.0.2.ebuild:
- Remove old version.
-
- 11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> vtk-5.0.3.ebuild:
- Add java? ( >=virtual/jre-1.5 ) to RDEPEND.
-
- 28 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Added VTKHOME as exported environmental variable.
-
- 08 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Re-added compile flag for javac needed on amd64 (see bug #177506).
-
- 06 May 2007; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.0.3-lammpi.patch, vtk-5.0.3.ebuild:
- Added patch fixing cmake files to properly detect and add lam-mpi
- libraries.
-
- 04 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Check for qt3support useflag when building the examples under qt4
- (see bug #176847).
-
- 01 May 2007; Markus Dittrich <markusle@gentoo.org> metadata.xml,
- vtk-5.0.3.ebuild:
- Removed explicit java CLASSPATH and added the friendly java folks
- to metadata (see bug #176547).
-
-*vtk-5.0.3 (23 Apr 2007)
-
- 23 Apr 2007; Markus Dittrich <markusle@gentoo.org>
- -files/vtk-qt-gentoo.patch, -vtk-5.0.0.ebuild, -vtk-5.0.1.ebuild,
- +vtk-5.0.3.ebuild:
- Version bump and removed old versions. Thanks much to Sebastien
- Fabbro <bicatali@gentoo.org> for his ebuild.
-
- 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> vtk-5.0.0.ebuild:
- moved from USE tcltk to tk, see bug 17808
-
-*vtk-5.0.2 (02 Dec 2006)
-
- 02 Dec 2006; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.2.ebuild:
- Version bump.
-
- 18 Nov 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.1.ebuild:
- Added -j1 back to ebuild since some people still experience problems
- with parallel builds (see discussion on bug #146767).
-
- 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> vtk-5.0.0.ebuild:
- Added call to java-pkg_pkg_setup, for bug #142708
-
- 23 Sep 2006; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.0.1-python2.5-gentoo.patch, vtk-5.0.1.ebuild:
- Added patch to fix compile problems with python-2.5
- (see bug #148727).
-
- 08 Sep 2006; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-qt-gentoo.patch, -files/vtk-qt3-qt4-gentoo.patch,
- vtk-5.0.0.ebuild, vtk-5.0.1.ebuild:
- Renamed the qt patch in an effort to get rid of the executable
- permissions. Also cleaned up the ebuilds some.
-
- 08 Sep 2006; Markus Dittrich <markusle@gentoo.org>
- files/vtk-qt3-qt4-gentoo.patch, -files/vtk-4.2.6-gcc34.patch,
- -vtk-4.2.6.ebuild:
- Removed old version since it doesn't build any more. Also fixed
- permissions for the vtk-qt patch (see bug #146826).
-
- 20 Jul 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.1.ebuild:
- Moved to new java system. Removed -j1 from emake since it works
- fine here with -j2.
-
-*vtk-5.0.1 (09 Jul 2006)
-
- 09 Jul 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild,
- vtk-5.0.0.ebuild, +vtk-5.0.1.ebuild:
- Version bump. Also, split tcltk USE flag into tcl and tk and moved
- to new style virtual/jdk.
-
- 23 Jun 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Added a warning to the ebuild that qt4 is the default in case both
- qt3 and qt4 are selected as use flags (see bug #137658).
-
- 11 Jun 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Fix RDEPEND and cmake configuration such that tcl/tk is only
- pulled in and used if USE=tcltk. This closes bug #136324.
-
- 27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest:
- Fixing SHA256 digest, pass four
-
- 21 Apr 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Depend on cmake-2.2.x to be able to properly compile against QT4.
- This fixes bug #130471.
-
- 07 Apr 2006; Markus Dittrich <markusle@gentoo.org> ChangeLog:
- Removed from package.mask after testing.
-
- 27 Mar 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Added proper JAVA_AWT_LIBRARY cmake variable for amd64 platform.
- Thanks to Sebastiaan <s.breedveld@erasmusmc.nl> for pointing this
- out (c.f. bug #123178).
-
- 26 Mar 2006; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-qt3-qt4-gentoo.patch, vtk-5.0.0.ebuild:
- Added a small fix for java compilation on amd64 as detailed
- in bug #123178. Thanks to Sebastiaan <s.breedveld@erasmusmc.nl> for
- the fix. Also enabled compilation of vtk against either QT3 or QT4.
-
- 06 Mar 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Fixed some QT3 issues and forced -j1 during emake. Thanks
- much to Sebastiaan <s.breedveld@erasmusmc.nl> for his fixes
- and testing.
-
-*vtk-5.0.0 (05 Mar 2006)
-
- 05 Mar 2006; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.0.ebuild:
- Version bump. Many thanks to Toon Verstraelen
- <Toon.Verstraelen@UGent.be> and Sebastiaan
- <s.breedveld@erasmusmc.nl> for their ebuilds and patches.
- This fixes bug #123178.
-
- 26 Feb 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Added cmake command line flag to prevent insecure RUNPATHS
- (c.f. bug #122875).
-
- 22 Jan 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Fix dependencies for modular X and replace instances of lib with
- $(get_libdir).
-
- 17 Jan 2006; Markus Dittrich <markusle@gentoo.org> metadata.xml:
- Changed maintainer to Markus Dittrich <markusle@gentoo.org>.
-
- 19 Dec 2005; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Use python eclass functions to determine installed python version.
-
- 18 Dec 2005; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Fixed compilation problems when using cmake-2.2.x and when compiling against
- python 2.4.x. Also corrected installation path of vtk jar file. This fixes
- bugs #112119, #103343, #113597.
-
- 08 Oct 2005; Thomas Matthijs <axxo@gentoo.org> vtk-4.2.6.ebuild:
- use java-pkg_dojar not dojar
-
- 24 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> vtk-4.2.6.ebuild:
- No longer using cp -a (bug #103487)
-
- 20 Aug 2005; Olivier Fisette <ribosome@gentoo.org> vtk-4.2.6.ebuild:
- Removed unused "data" USE flag (fixes bug #100418).
-
- 03 Jun 2005; Patrick Dawson <pkdawson@gentoo.org> vtk-4.2.6.ebuild:
- Typo fix.
-
-*vtk-4.2.6 (10 May 2005)
-
- 10 May 2005; Patrick Dawson <pkdawson@gentoo.org>
- +files/vtk-4.2.6-gcc34.patch, +vtk-4.2.6.ebuild:
- Initial import. See bug #25335.
diff --git a/sci-libs/vtk/files/vtk-6.0.0-cg-path.patch b/sci-libs/vtk/files/vtk-6.0.0-cg-path.patch
deleted file mode 100644
index c83a06b..0000000
--- a/sci-libs/vtk/files/vtk-6.0.0-cg-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- Utilities/MaterialLibrary/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Utilities/MaterialLibrary/CMakeLists.txt b/Utilities/MaterialLibrary/CMakeLists.txt
-index 330a189..ede97be 100644
---- a/Utilities/MaterialLibrary/CMakeLists.txt
-+++ b/Utilities/MaterialLibrary/CMakeLists.txt
-@@ -116,7 +116,7 @@ MACRO(get_modules modules prefix files )
- ENDMACRO(get_modules)
-
- SET(CMD_DEP ProcessShader)
--SET(CMD ProcessShader)
-+SET(CMD ./ProcessShader.sh)
-
- IF (VTK_USE_CG_SHADERS)
- # Create the Cg library.
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
deleted file mode 100644
index 50d848a..0000000
--- a/sci-libs/vtk/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>sci</herd>
- <herd>java</herd>
- <maintainer>
- <email>jlec@gentoo.org</email>
- <name>Justin Lecher</name>
- </maintainer>
- <use>
- <flag name="boost">Add support for boost</flag>
- <flag name="chemistry">Add chemistry support</flag>
- <flag name="cg">Use nvidia's cg shaders</flag>
- <flag name="patented">Build patented classes</flag>
- <flag name="offscreen">Offscreen rendering through OSMesa</flag>
- <flag name="R">Enable support for dev-lang/R</flag>
- </use>
-</pkgmetadata>
diff --git a/sci-libs/vtk/vtk-6.0.0.ebuild b/sci-libs/vtk/vtk-6.0.0.ebuild
deleted file mode 100644
index 36a30ba..0000000
--- a/sci-libs/vtk/vtk-6.0.0.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.6 2013/03/02 23:24:14 hwoarang Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-WANT_CMAKE="always"
-
-inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qt4-r2 versionator toolchain-funcs cmake-utils
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="http://www.vtk.org/"
-SRC_URI="
- http://www.${PN}.org/files/release/${SPV}/${P/_rc/.rc}.tar.gz
- doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )
- examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz )"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="
- boost chemistry cg doc examples ffmpeg java mpi mysql odbc offscreen
- patented postgres python qt4 R test theora threads tk
- video_cards_nvidia X"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- ^^ ( X offscreen )"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/libxml2:2
- media-libs/freetype
- media-libs/libpng
- media-libs/mesa
- media-libs/tiff
- sci-libs/hdf5
- sys-libs/zlib
- virtual/jpeg
- virtual/opengl
- x11-libs/gl2ps
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXt
- cg? ( media-gfx/nvidia-cg-toolkit )
- examples? (
- dev-qt/qtcore:4[qt3support]
- dev-qt/qtgui:4[qt3support] )
- ffmpeg? ( virtual/ffmpeg )
- java? ( >=virtual/jre-1.5 )
- mpi? ( virtual/mpi[cxx,romio] )
- mysql? ( virtual/mysql )
- odbc? ( dev-db/unixODBC )
- offscreen? ( media-libs/mesa[osmesa] )
- postgres? ( dev-db/postgresql-base )
- python? (
- ${PYTHON_DEPS}
- dev-python/sip[${PYTHON_USEDEP}] )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- dev-qt/qtsql:4
- dev-qt/qtwebkit:4
- python? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
- )
- tk? ( dev-lang/tk )
- theora? ( media-libs/libtheora )
- tk? ( dev-lang/tk )
- video_cards_nvidia? ( media-video/nvidia-settings )
- R? ( dev-lang/R )"
-DEPEND="${RDEPEND}
- boost? ( >=dev-libs/boost-1.40.0[mpi?] )
- doc? ( app-doc/doxygen )
- java? ( >=virtual/jdk-1.5 )
- dev-util/cmake"
-
-S="${WORKDIR}"/VTK${PV/_rc/.rc}
-
-PATCHES=(
- "${FILESDIR}"/${P}-cg-path.patch
- )
-
-pkg_setup() {
- echo
- einfo "Please note that the VTK build occasionally fails when"
- einfo "using parallel make. Hence, if you experience a build"
- einfo "failure please try re-emerging with MAKEOPTS=\"-j1\" first."
- echo
-
- java-pkg-opt-2_pkg_setup
-
- use python && python-single-r1_pkg_setup
- append-cppflags -D__STDC_CONSTANT_MACROS
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # general configuration
- local mycmakeargs=(
- -Wno-dev
-# -DVTK_INSTALL_PACKAGE_DIR=/$(get_libdir)/${PN}-${SPV}
- -DCMAKE_SKIP_RPATH=YES
- -DVTK_DIR="${S}"
- -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
- -DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
- -DBUILD_SHARED_LIBS=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FreeType=ON
- -DVTK_USE_SYSTEM_GL2PS=ON
- -DVTK_USE_SYSTEM_HDF5=ON
- -DVTK_USE_SYSTEM_JPEG=ON
-# -DVTK_USE_SYSTEM_LIBPROJ4=ON
- -DVTK_USE_SYSTEM_LibXml2=ON
- -DVTK_USE_SYSTEM_PNG=ON
- -DVTK_USE_SYSTEM_TIFF=ON
- -DVTK_USE_SYSTEM_ZLIB=ON
-# -DVTK_USE_SYSTEM_xdmf2=ON
- -DHDF5_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
- -DHDF5_INCLUDE_DIRS="${EPREFIX}/usr/include"
- -DBUILD_TESTING=OFF
- -DBUILD_EXAMPLES=OFF
- -DVTK_USE_HYBRID=ON
- -DVTK_USE_GL2PS=ON
- -DVTK_USE_RENDERING=ON
- )
-
- # use flag triggered options
- mycmakeargs+=(
- $(cmake-utils_use boost VTK_USE_BOOST)
- $(cmake-utils_use cg VTK_USE_CG_SHADERS)
- $(cmake-utils_use chemistry VTK_USE_CHEMISTRY)
- $(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
- $(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use java VTK_USE_JAVA)
- $(cmake-utils_use mpi VTK_USE_MPI)
- $(cmake-utils_use mysql VTK_USE_MYSQL)
- $(cmake-utils_use patented VTK_USE_PATENTED)
- $(cmake-utils_use postgres VTK_USE_POSTGRES)
- $(cmake-utils_use odbc VTK_USE_ODBC)
- $(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA)
- $(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA)
- $(cmake-utils_use qt4 VTK_USE_QT)
- $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER)
- $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
- $(cmake-utils_use tk VTK_USE_TK)
- $(cmake-utils_use threads VTK_USE_PARALLEL)
- $(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL)
- $(cmake-utils_use X VTK_USE_X)
- $(cmake-utils_use X VTK_USE_GUISUPPORT)
- $(cmake-utils_use R VTK_USE_GNU_R)
- )
-
- use tk &&
- mycmakeargs+=(
- -DVTK_WRAP_TCL=ON
- -DVTK_WRAP_TK=ON
- -DVTK_TCL_INCLUDE_DIR="${EPREFIX}/usr/include"
- -DVTK_TCL_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
- -DVTK_TK_INCLUDE_DIR="${EPREFIX}/usr/include"
- -DVTK_TK_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
- -DVTK_INSTALL_TCL_DIR="$(get_libdir)"
- )
-
- use theora && mycmakeargs+=( -DVTK_USE_SYSTEM_OGGTHEORA=ON )
-
- # mpi needs the parallel framework
- if use mpi && use !threads; then
- mycmakeargs+=( -DVTK_USE_PARALLEL=ON )
- fi
-
- if use java; then
- mycmakeargs+=(
- -DVTK_WRAP_JAVA=ON
- -DJAVA_AWT_INCLUDE_PATH=`java-config -O`/include
- -DJAVA_INCLUDE_PATH:PATH=`java-config -O`/include
- -DJAVA_INCLUDE_PATH2:PATH=`java-config -O`/include/linux
- )
-
- if [ "${ARCH}" == "amd64" ]; then
- mycmakeargs+=(-DJAVA_AWT_LIBRARY=`java-config -O`/jre/lib/${ARCH}/libjawt.so)
- else
- mycmakeargs+=(-DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so)
- fi
- fi
-
- if use python; then
- mycmakeargs+=(
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- -DVTK_WRAP_PYTHON=ON
- -DVTK_WRAP_PYTHON_SIP=ON
- -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
- -DSIP_INCLUDE_DIR="$(python_get_includedir)"
- -DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
- -DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}")
- fi
-
- if use qt4 ; then
- mycmakeargs+=(
- -DVTK_USE_GUISUPPORT=ON
- -DVTK_USE_QVTK=ON
- -DVTK_USE_QVTK_OPENGL=ON
- -DVTK_USE_QVTK_QTOPENGL=ON
- -DQT_WRAP_CPP=ON
- -DQT_WRAP_UI=ON
- -DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN}
- -DDESIRED_QT_VERSION=4
- -DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc"
- -DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic"
- -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4"
- -DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake")
- fi
-
- cmake-utils_src_configure
-
- cat >> "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh <<- EOF
- #!${EPREFIX}/bin/bash
-
- export LD_LIBRARY_PATH="${BUILD_DIR}"/lib
- "${BUILD_DIR}"/bin/vtkProcessShader-${SPV} \$@
- EOF
- chmod 750 "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh || die
-}
-
-src_install() {
- # install docs
- HTML_DOCS=( "${S}"/README.html )
-
- cmake-utils_src_install
-
- # install Tcl docs
- docinto vtk_tcl
- dodoc "${S}"/Wrapping/Tcl/README
-
- # install examples
- if use examples; then
- insinto /usr/share/${PN}
- mv -v Examples examples || die
- doins -r examples
- mv -v "${WORKDIR}"/{VTKDATA${PV},data} || die
- doins -r "${WORKDIR}"/data
- fi
-
- #install big docs
- if use doc; then
- cd "${WORKDIR}"/html
- rm -f *.md5 || die "Failed to remove superfluous hashes"
- einfo "Installing API docs. This may take some time."
- insinto "/usr/share/doc/${PF}/api-docs"
- doins -r ./*
- fi
-
- # environment
- 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}
-}
-
-pkg_postinst() {
- if use patented; then
- ewarn "Using patented code in VTK may require a license."
- ewarn "For more information, please read:"
- ewarn "http://public.kitware.com/cgi-bin/vtkfaq?req=show&file=faq07.005.htp"
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/vtk/files/, sci-libs/vtk/
@ 2014-01-18 7:39 Justin Lecher
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2014-01-18 7:39 UTC (permalink / raw
To: gentoo-commits
commit: d323623e493fc20f06e8508ad8c1f4c44fe8f685
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 16:36:38 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 16:36:38 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d323623e
InCVS
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
---
sci-libs/vtk/ChangeLog | 495 ---------------------------
sci-libs/vtk/files/vtk-6.0.0-install.patch | 19 -
sci-libs/vtk/files/vtk-6.0.0-netcdf.patch | 75 ----
sci-libs/vtk/files/vtk-6.0.0-system.patch | 27 --
sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch | 12 -
sci-libs/vtk/metadata.xml | 19 -
sci-libs/vtk/vtk-6.0.0.ebuild | 321 -----------------
7 files changed, 968 deletions(-)
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
deleted file mode 100644
index 8266d06..0000000
--- a/sci-libs/vtk/ChangeLog
+++ /dev/null
@@ -1,495 +0,0 @@
-# ChangeLog for sci-libs/vtk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.108 2013/06/05 01:21:35 lu_zero Exp $
-
- 11 Jan 2014; Justin Lecher <jlec@gentoo.org> vtk-6.0.0.ebuild,
- +files/vtk-6.0.0-install.patch, +files/vtk-6.0.0-netcdf.patch,
- +files/vtk-6.0.0-system.patch, +files/vtk-6.0.0-vtkpython.patch,
- metadata.xml:
- First completely working version
-
- 11 Jan 2014; Justin Lecher <jlec@gentoo.org> vtk-6.0.0.ebuild,
- +files/vtk-6.0.0-install.patch, +files/vtk-6.0.0-netcdf.patch,
- +files/vtk-6.0.0-system.patch, +files/vtk-6.0.0-vtkpython.patch:
- First completely working version
-
- 16 Jul 2013; Justin Lecher <jlec@gentoo.org> vtk-6.0.0.ebuild,
- -files/vtk-5.2.0-tcl-install.patch,
- -files/vtk-5.4.2-boost-property_map.patch, -files/vtk-5.4.2-cg-path.patch,
- -files/vtk-5.4.2-libpng14.patch, -files/vtk-5.6.0-R.patch,
- -files/vtk-5.6.0-boost-property_map.patch, -files/vtk-5.6.0-cg-path.patch,
- -files/vtk-5.6.0-ffmpeg.patch, -files/vtk-5.6.0-libpng14.patch,
- -files/vtk-5.6.0-odbc.patch, -files/vtk-5.6.1-ffmpeg.patch,
- -files/vtk-5.6.1-gcc-46.patch, -files/vtk-5.6.1-libav-0.8.patch,
- -files/vtk-5.6.1-libpng15.patch, -files/vtk-5.8.0-R.patch,
- -files/vtk-5.8.0-boost.patch, -files/vtk-5.10.1-ffmpeg-1.patch,
- -files/vtk-5.10.1-libav-9.patch, -files/vtk-5.10.1-tcl8.6.patch,
- metadata.xml:
- Version BUmp
-
-*vtk-6.0.0 (11 Jul 2013)
-
- 11 Jul 2013; Justin Lecher <jlec@gentoo.org> +vtk-6.0.0.ebuild,
- +files/vtk-5.2.0-tcl-install.patch,
- +files/vtk-5.4.2-boost-property_map.patch, +files/vtk-5.4.2-cg-path.patch,
- +files/vtk-5.4.2-libpng14.patch, +files/vtk-5.6.0-R.patch,
- +files/vtk-5.6.0-boost-property_map.patch, +files/vtk-5.6.0-cg-path.patch,
- +files/vtk-5.6.0-ffmpeg.patch, +files/vtk-5.6.0-libpng14.patch,
- +files/vtk-5.6.0-odbc.patch, +files/vtk-5.6.1-ffmpeg.patch,
- +files/vtk-5.6.1-gcc-46.patch, +files/vtk-5.6.1-libav-0.8.patch,
- +files/vtk-5.6.1-libpng15.patch, +files/vtk-5.8.0-R.patch,
- +files/vtk-5.8.0-boost.patch, +files/vtk-5.10.1-ffmpeg-1.patch,
- +files/vtk-5.10.1-libav-9.patch, +files/vtk-5.10.1-tcl8.6.patch,
- +files/vtk-6.0.0-cg-path.patch, +metadata.xml:
- First working version
-
- 05 Jun 2013; Luca Barbato <lu_zero@gentoo.org> vtk-5.10.1.ebuild,
- +files/vtk-5.10.1-libav-9.patch:
- libav 9 (and upcoming 10) support.
-
- 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> vtk-5.10.0.ebuild,
- vtk-5.10.1.ebuild:
- Move Qt dependencies to the new category
-
- 31 Jan 2013; Justin Lecher <jlec@gentoo.org> files/vtk-5.10.1-tcl8.6.patch:
- Backport upstream patch for tcl/tk-8.6.0, #454762
-
- 17 Jan 2013; Alexis Ballier <aballier@gentoo.org> vtk-5.10.1.ebuild,
- +files/vtk-5.10.1-ffmpeg-1.patch:
- Fix build with latest ffmpeg. Part of bug #450464.
-
- 15 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild,
- +files/vtk-5.10.1-tcl8.6.patch:
- Better fix for tcl support
-
- 14 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild:
- Solve problems with USE=examples, #447146
-
- 10 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild:
- Add compatibility fix for tcl8.6
-
-*vtk-5.10.1 (13 Dec 2012)
-
- 13 Dec 2012; Justin Lecher <jlec@gentoo.org> +vtk-5.10.1.ebuild,
- metadata.xml:
- Version Bump
-
- 06 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> vtk-5.10.0.ebuild:
- Keyword amd64-linux and x86-linux
-
- 04 Sep 2012; Justin Lecher <jlec@gentoo.org> -vtk-5.6.1.ebuild,
- -vtk-5.8.0.ebuild:
- Drop old
-
-*vtk-5.10.0 (07 Jun 2012)
-
- 07 Jun 2012; Justin Lecher <jlec@gentoo.org> files/vtk-5.8.0-boost.patch,
- +vtk-5.10.0.ebuild, metadata.xml:
- Version Bump, #420103; Update boost patch, #412945
-
- 20 Mar 2012; Jeroen Roovers <jer@gentoo.org> vtk-5.8.0.ebuild:
- Sort IUSE entries. Remove IUSE=tk duplicate by zvasylvv (bug #408871).
-
- 27 Feb 2012; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild:
- Fix typo in Changelog and commit fix for #401839
-
- 13 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> vtk-5.8.0.ebuild:
- Add missing dependency on media-video/nvidia-settings
-
- 10 Feb 2012; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild,
- +files/vtk-5.8.0-boost.patch:
- Backport patch for boost-1.48, #400901
-
- 10 Feb 2012; Justin Lecher <jlec@gentoo.org> -vtk-5.4.2-r1.ebuild,
- -vtk-5.6.0-r2.ebuild, -vtk-5.6.0-r3.ebuild, vtk-5.6.1.ebuild,
- vtk-5.8.0.ebuild:
- Use selected python ABI, #401839, patch by JTRiley; dropped old
-
- 29 Dec 2011; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild:
- Correct PYTHON_SETUP_ARGS to VTK_PYTHON_SETUP_ARGS, #396297
-
- 29 Dec 2011; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild:
- Add missing deps for hdf5 and PyQt4/sip support
-
-*vtk-5.8.0 (27 Dec 2011)
-
- 27 Dec 2011; Justin Lecher <jlec@gentoo.org> +vtk-5.8.0.ebuild,
- +files/vtk-5.8.0-R.patch:
- Version Bump, #396119
-
- 16 Nov 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.1.ebuild,
- +files/vtk-5.6.1-libav-0.8.patch, metadata.xml:
- Add debian patch for building against libav-0.8, #380681
-
- 13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> vtk-5.6.1.ebuild,
- +files/vtk-5.6.1-libpng15.patch:
- Fix building with libpng15 wrt #378393 by Diego Elio Pettenò
-
- 04 Aug 2011; Fabian Groffen <grobian@gentoo.org> vtk-5.6.1.ebuild:
- Allow to find Python from Prefix, bug #376917
-
- 20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
- Drop maintainer due retirement, bug #105599
-
- 25 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild,
- vtk-5.6.0-r3.ebuild, vtk-5.6.1.ebuild, files/vtk-5.6.1-ffmpeg.patch,
- +files/vtk-5.6.1-gcc-46.patch:
- Correct patch for USE=ffmpeg, 327957; Fix for gcc-4.6
-
- 17 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r3.ebuild,
- vtk-5.6.1.ebuild:
- Fix ofr installation of examples, #363919
-
-*vtk-5.6.1 (16 Apr 2011)
-*vtk-5.6.0-r3 (16 Apr 2011)
-
- 16 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild,
- +vtk-5.6.0-r3.ebuild, +files/vtk-5.6.0-ffmpeg.patch, +vtk-5.6.1.ebuild,
- +files/vtk-5.6.1-ffmpeg.patch:
- Version Bump, Fixes for ffmpeg, Fortify source, py-2.7; #362701, #350318,
- #344065, #338819, #334705, #327957
-
- 31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> vtk-5.6.0-r2.ebuild:
- Depend on virtual/ffmpeg instead of media-video/ffmpeg.
-
- 02 Mar 2011; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild,
- vtk-5.6.0-r2.ebuild:
- Correct Slots for gtk 3 introduction to tree
-
- 09 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> +vtk-5.4.2-r1.ebuild,
- +files/vtk-5.4.2-boost-property_map.patch, +files/vtk-5.4.2-cg-path.patch,
- +files/vtk-5.4.2-libpng14.patch:
- Bring back vtk-5.4.x as sci-visualization/mayavi:1 depends on it.
- media-libs/jpeg -> virtual/jpeg
-
- 08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
- -files/vtk-5.0.3-mpi.patch, -files/vtk-5.0.4-gcc4.3.patch,
- -vtk-5.4.2-r1.ebuild, -files/vtk-5.4.2-boost-property_map.patch,
- -files/vtk-5.4.2-cg-path.patch, -files/vtk-5.4.2-libpng14.patch,
- vtk-5.6.0-r2.ebuild:
- media-libs/jpeg -> virtual/jpeg. Drop old.
-
- 24 Jul 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild:
- Fix for compilation with USE=ffmpeg, #327517
-
- 11 Jul 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild,
- +files/vtk-5.6.0-odbc.patch:
- Imported support for dbs from sci overlay, 327601, thanks yFrancois Bissey
-
- 17 Jun 2010; Justin Bronder <jsbronder@gentoo.org> vtk-5.4.2-r1.ebuild:
- Remove sys-cluster/lam-mpi handling, see #324415.
-
- 09 Jun 2010; Justin Lecher <jlec@gentoo.org> -vtk-5.4.2.ebuild:
- removed old version which having problems with PYTHON ABIs stuff
-
- 07 Jun 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild:
- Fixed ogg -> theora USE transition
-
- 31 May 2010; Justin Lecher <jlec@gentoo.org> metadata.xml:
- Added myself as maintainer
-
-*vtk-5.6.0-r2 (29 May 2010)
-
- 29 May 2010; Justin Lecher <jlec@gentoo.org> -vtk-5.6.0-r1.ebuild,
- +vtk-5.6.0-r2.ebuild:
- Don't use bundled libtheora, moved USE ogg -> theora
-
- 29 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r1.ebuild:
- Added missing DEPS
-
- 29 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r1.ebuild:
- Corrected version of cmake in DEPEND for mpi
-
-*vtk-5.6.0-r1 (28 May 2010)
-
- 28 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild,
- files/vtk-5.4.2-boost-property_map.patch, -vtk-5.6.0.ebuild,
- +vtk-5.6.0-r1.ebuild, +files/vtk-5.6.0-R.patch,
- files/vtk-5.6.0-boost-property_map.patch:
- Fixed correct detection R libs
-
-*vtk-5.6.0 (28 May 2010)
-
- 28 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild,
- +vtk-5.6.0.ebuild, +files/vtk-5.6.0-boost-property_map.patch,
- +files/vtk-5.6.0-cg-path.patch, +files/vtk-5.6.0-libpng14.patch:
- Version Bump #321505; Added support for ogg R; prelimary support for
- PREFIX
-
- 22 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild,
- vtk-5.4.2-r1.ebuild:
- Add x11-libs/qt-sql to deps, #301684
-
- 25 Apr 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild:
- Python ABI fixes, #316229
-
- 26 Mar 2010; Ben de Groot <yngwin@gentoo.org> vtk-5.4.2.ebuild,
- vtk-5.4.2-r1.ebuild:
- Don't inherit unused qt3 eclass (bug #310669)
-
- 11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> vtk-5.4.2-r1.ebuild,
- +files/vtk-5.4.2-libpng14.patch:
- Fix building with libpng14.
-
- 11 Feb 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild,
- vtk-5.4.2-r1.ebuild:
- Removed qt3 support as it is no longer in the tree
-
- 21 Jan 2010; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2-r1.ebuild,
- +files/vtk-5.4.2-boost-property_map.patch:
- Added patch to allow compilation against boost-1.42 (fixes #301684).
-
- 16 Jan 2010; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2-r1.ebuild:
- Updated handling of mycmakeargs from cmake-utils.eclass.
-
-*vtk-5.4.2-r1 (19 Dec 2009)
-
- 19 Dec 2009; Markus Dittrich <markusle@gentoo.org> +vtk-5.4.2-r1.ebuild:
- New revision uses cmake-utils eclass and is significantly cleaned up.
- This should have also fixed bugs #295053 and #287591.
- Thanks much to Francois Bissey <f.r.bissey@massey.ac.nz> for his help.
-
- 17 Dec 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Updated dependency on cmake to >=2.6 (fixes bug #295531).
-
- 04 Dec 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Added short notice regarding possible parallel make issues per bug
- #244896.
-
- 24 Nov 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Removed boost from RDEPEND (fixes bug #293083).
-
- 18 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> -vtk-5.0.4.ebuild,
- -vtk-5.2.0-r1.ebuild:
- Remove old versions using built_with_use.
-
- 01 Sep 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild:
- Added missing dependency on qt-opengl (fixes bug #283181).
-
-*vtk-5.4.2 (17 Jul 2009)
-
- 17 Jul 2009; Markus Dittrich <markusle@gentoo.org> -vtk-5.0.3.ebuild,
- +files/vtk-5.4.2-cg-path.patch, +vtk-5.4.2.ebuild:
- Version bump (fixes bug #269040). Also removed old version.
-
- 27 Oct 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.2.0-r1.ebuild:
- Attempt to fix sandbox violations (see bug #244378).
-
-*vtk-5.2.0-r1 (05 Oct 2008)
-
- 05 Oct 2008; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.2.0-tcl-install.patch, -vtk-5.2.0.ebuild,
- +vtk-5.2.0-r1.ebuild:
- Fixed improper install location of support files (see bug #239553).
-
-*vtk-5.2.0 (01 Oct 2008)
-
- 01 Oct 2008; Markus Dittrich <markusle@gentoo.org> +vtk-5.2.0.ebuild:
- Version bump (fixes bug #238883). Thanks much to Steve Yin
- <steve@chinavfx.net> for his ebuild.
-
- 07 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
- Add USE flag description to metadata wrt GLEP 56.
-
- 28 Jul 2008; Carsten Lohrke <carlo@gentoo.org> vtk-5.0.3.ebuild:
- QA: Get rid of deprecated qt?_min_version().
-
- 27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> vtk-5.0.4.ebuild:
- Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
-
- 08 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> vtk-5.0.4.ebuild:
- Add a qt-gui dependency, it really is needed.
-
- 03 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> vtk-5.0.4.ebuild:
- Migrate Dependencies to permit Split QT 4.4 to satisfy dependencies, bug
- #217189
-
- 24 May 2008; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.0.4-gcc4.3.patch, vtk-5.0.4.ebuild:
- Added gcc-4.3 compatibility patch (see bug #223383). Thanks much to
- Bert Karwatzki <spasswolf@web.de> for his patch.
-
- 09 Mar 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.0.4.ebuild:
- Backported support for tcl/tk-8.5 from cvs head (fixes bug 212700).
- Thanks much to Pacho Ramos <pacho@condmat1.ciencias.uniovi.es> for
- his patch.
-
-*vtk-5.0.4 (06 Mar 2008)
-
- 06 Mar 2008; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.4.ebuild:
- Version bump.
-
- 29 Feb 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Fixed bogus install location (see bug #211819). Thanks much to
- Matthias Langer <mlangc@gmx.at> for his patch.
-
- 21 Feb 2008; Markus Dittrich <markusle@gentoo.org>
- -files/vtk-5.0.1-python2.5-gentoo.patch, -files/vtk-5.0.3-lammpi.patch,
- +files/vtk-5.0.3-mpi.patch, vtk-5.0.3.ebuild:
- Removed support for mpich and added support for mpich2, openmpi, and
- lam-mpi. Also fixed some QA issues and added qt4 eclass.
-
- 19 Aug 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Fixed incomplete RDEPEND.
-
- 01 Aug 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Added LGPL-2 to LICENSE since it is needed for gl2ps (see bug 146019).
-
- 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vtk-5.0.3.ebuild:
- Drop virtual/x11 references.
-
- 11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> -vtk-5.0.2.ebuild:
- Remove old version.
-
- 11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> vtk-5.0.3.ebuild:
- Add java? ( >=virtual/jre-1.5 ) to RDEPEND.
-
- 28 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Added VTKHOME as exported environmental variable.
-
- 08 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Re-added compile flag for javac needed on amd64 (see bug #177506).
-
- 06 May 2007; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.0.3-lammpi.patch, vtk-5.0.3.ebuild:
- Added patch fixing cmake files to properly detect and add lam-mpi
- libraries.
-
- 04 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
- Check for qt3support useflag when building the examples under qt4
- (see bug #176847).
-
- 01 May 2007; Markus Dittrich <markusle@gentoo.org> metadata.xml,
- vtk-5.0.3.ebuild:
- Removed explicit java CLASSPATH and added the friendly java folks
- to metadata (see bug #176547).
-
-*vtk-5.0.3 (23 Apr 2007)
-
- 23 Apr 2007; Markus Dittrich <markusle@gentoo.org>
- -files/vtk-qt-gentoo.patch, -vtk-5.0.0.ebuild, -vtk-5.0.1.ebuild,
- +vtk-5.0.3.ebuild:
- Version bump and removed old versions. Thanks much to Sebastien
- Fabbro <bicatali@gentoo.org> for his ebuild.
-
- 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> vtk-5.0.0.ebuild:
- moved from USE tcltk to tk, see bug 17808
-
-*vtk-5.0.2 (02 Dec 2006)
-
- 02 Dec 2006; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.2.ebuild:
- Version bump.
-
- 18 Nov 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.1.ebuild:
- Added -j1 back to ebuild since some people still experience problems
- with parallel builds (see discussion on bug #146767).
-
- 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> vtk-5.0.0.ebuild:
- Added call to java-pkg_pkg_setup, for bug #142708
-
- 23 Sep 2006; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-5.0.1-python2.5-gentoo.patch, vtk-5.0.1.ebuild:
- Added patch to fix compile problems with python-2.5
- (see bug #148727).
-
- 08 Sep 2006; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-qt-gentoo.patch, -files/vtk-qt3-qt4-gentoo.patch,
- vtk-5.0.0.ebuild, vtk-5.0.1.ebuild:
- Renamed the qt patch in an effort to get rid of the executable
- permissions. Also cleaned up the ebuilds some.
-
- 08 Sep 2006; Markus Dittrich <markusle@gentoo.org>
- files/vtk-qt3-qt4-gentoo.patch, -files/vtk-4.2.6-gcc34.patch,
- -vtk-4.2.6.ebuild:
- Removed old version since it doesn't build any more. Also fixed
- permissions for the vtk-qt patch (see bug #146826).
-
- 20 Jul 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.1.ebuild:
- Moved to new java system. Removed -j1 from emake since it works
- fine here with -j2.
-
-*vtk-5.0.1 (09 Jul 2006)
-
- 09 Jul 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild,
- vtk-5.0.0.ebuild, +vtk-5.0.1.ebuild:
- Version bump. Also, split tcltk USE flag into tcl and tk and moved
- to new style virtual/jdk.
-
- 23 Jun 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Added a warning to the ebuild that qt4 is the default in case both
- qt3 and qt4 are selected as use flags (see bug #137658).
-
- 11 Jun 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Fix RDEPEND and cmake configuration such that tcl/tk is only
- pulled in and used if USE=tcltk. This closes bug #136324.
-
- 27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest:
- Fixing SHA256 digest, pass four
-
- 21 Apr 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Depend on cmake-2.2.x to be able to properly compile against QT4.
- This fixes bug #130471.
-
- 07 Apr 2006; Markus Dittrich <markusle@gentoo.org> ChangeLog:
- Removed from package.mask after testing.
-
- 27 Mar 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Added proper JAVA_AWT_LIBRARY cmake variable for amd64 platform.
- Thanks to Sebastiaan <s.breedveld@erasmusmc.nl> for pointing this
- out (c.f. bug #123178).
-
- 26 Mar 2006; Markus Dittrich <markusle@gentoo.org>
- +files/vtk-qt3-qt4-gentoo.patch, vtk-5.0.0.ebuild:
- Added a small fix for java compilation on amd64 as detailed
- in bug #123178. Thanks to Sebastiaan <s.breedveld@erasmusmc.nl> for
- the fix. Also enabled compilation of vtk against either QT3 or QT4.
-
- 06 Mar 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
- Fixed some QT3 issues and forced -j1 during emake. Thanks
- much to Sebastiaan <s.breedveld@erasmusmc.nl> for his fixes
- and testing.
-
-*vtk-5.0.0 (05 Mar 2006)
-
- 05 Mar 2006; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.0.ebuild:
- Version bump. Many thanks to Toon Verstraelen
- <Toon.Verstraelen@UGent.be> and Sebastiaan
- <s.breedveld@erasmusmc.nl> for their ebuilds and patches.
- This fixes bug #123178.
-
- 26 Feb 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Added cmake command line flag to prevent insecure RUNPATHS
- (c.f. bug #122875).
-
- 22 Jan 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Fix dependencies for modular X and replace instances of lib with
- $(get_libdir).
-
- 17 Jan 2006; Markus Dittrich <markusle@gentoo.org> metadata.xml:
- Changed maintainer to Markus Dittrich <markusle@gentoo.org>.
-
- 19 Dec 2005; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Use python eclass functions to determine installed python version.
-
- 18 Dec 2005; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
- Fixed compilation problems when using cmake-2.2.x and when compiling against
- python 2.4.x. Also corrected installation path of vtk jar file. This fixes
- bugs #112119, #103343, #113597.
-
- 08 Oct 2005; Thomas Matthijs <axxo@gentoo.org> vtk-4.2.6.ebuild:
- use java-pkg_dojar not dojar
-
- 24 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> vtk-4.2.6.ebuild:
- No longer using cp -a (bug #103487)
-
- 20 Aug 2005; Olivier Fisette <ribosome@gentoo.org> vtk-4.2.6.ebuild:
- Removed unused "data" USE flag (fixes bug #100418).
-
- 03 Jun 2005; Patrick Dawson <pkdawson@gentoo.org> vtk-4.2.6.ebuild:
- Typo fix.
-
-*vtk-4.2.6 (10 May 2005)
-
- 10 May 2005; Patrick Dawson <pkdawson@gentoo.org>
- +files/vtk-4.2.6-gcc34.patch, +vtk-4.2.6.ebuild:
- Initial import. See bug #25335.
diff --git a/sci-libs/vtk/files/vtk-6.0.0-install.patch b/sci-libs/vtk/files/vtk-6.0.0-install.patch
deleted file mode 100644
index a97755a..0000000
--- a/sci-libs/vtk/files/vtk-6.0.0-install.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up VTK6.0.0/CMake/vtkModuleTop.cmake.install VTK6.0.0/CMake/vtkModuleTop.cmake
---- VTK6.0.0/CMake/vtkModuleTop.cmake.install 2013-06-12 13:47:10.000000000 -0600
-+++ VTK6.0.0/CMake/vtkModuleTop.cmake 2013-07-12 16:15:15.706008475 -0600
-@@ -330,10 +330,15 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT)
- CMake/pythonmodules.h.in
- CMake/UseVTK.cmake
- CMake/FindTCL.cmake
-+ CMake/TopologicalSort.cmake
- CMake/vtkTclTkMacros.cmake
- CMake/vtk-forward.c.in
- CMake/vtkForwardingExecutable.cmake
-+ CMake/vtkGroups.cmake
- CMake/vtkJavaWrapping.cmake
-+ CMake/vtkMakeInstantiator.cmake
-+ CMake/vtkMakeInstantiator.cxx.in
-+ CMake/vtkMakeInstantiator.h.in
- CMake/vtkModuleAPI.cmake
- CMake/vtkModuleHeaders.cmake.in
- CMake/vtkModuleInfo.cmake.in
diff --git a/sci-libs/vtk/files/vtk-6.0.0-netcdf.patch b/sci-libs/vtk/files/vtk-6.0.0-netcdf.patch
deleted file mode 100644
index df0ef94..0000000
--- a/sci-libs/vtk/files/vtk-6.0.0-netcdf.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt
---- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700
-+++ VTK/IO/NetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700
-@@ -10,5 +10,5 @@ set(Module_SRCS
-
- vtk_module_library(vtkIONetCDF ${Module_SRCS})
-
--target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
-+target_link_libraries(vtkIONetCDF netcdf_c++ netcdf)
- set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
-diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt
---- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700
-+++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700
-@@ -8,4 +8,4 @@ set(Module_SRCS
-
- vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
-
--target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
-+target_link_libraries(vtkIOParallelNetCDF netcdf)
-diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
---- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700
-+++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-01-28 15:40:27.534030910 -0700
-@@ -241,7 +241,7 @@ ENDIF(APPLE)
-
-
- VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
--TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
-+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
-
- #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
-
-diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt
---- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700
-+++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700
-@@ -1,8 +1,12 @@
- set(vtknetcdf_THIRD_PARTY 1)
--set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
--set(vtknetcdf_INCLUDE_DIRS
-- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
-- ${vtknetcdf_BINARY_DIR}/vtknetcdf
-- )
-+if(NOT VTK_USE_SYSTEM_NETCDF)
-+ set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
-+ set(vtknetcdf_INCLUDE_DIRS
-+ ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
-+ ${vtknetcdf_BINARY_DIR}/vtknetcdf
-+ )
-+ add_subdirectory(vtknetcdf)
-+else(NOT VTK_USE_SYSTEM_NETCDF)
-+ set(vtknetcdf_LIBRARIES netcdf)
-+endif()
- vtk_module_export_info()
--add_subdirectory(vtknetcdf)
-diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
---- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2013-01-28 14:44:36.000000000 -0700
-+++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-01-28 15:40:00.826176289 -0700
-@@ -16,6 +16,6 @@
- #define __vtk_netcdfcpp_h
-
- /* Use the netcdf library configured for VTK. */
--#include <vtknetcdf/cxx/netcdfcpp.h>
-+#include <netcdfcpp.h>
-
- #endif
-diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h
---- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2013-01-28 14:44:36.000000000 -0700
-+++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-01-28 15:40:00.826176289 -0700
-@@ -16,6 +16,6 @@
- #define __vtk_netcdf_h
-
- /* Use the netcdf library configured for VTK. */
--#include <vtknetcdf/include/netcdf.h>
-+#include <netcdf.h>
-
- #endif
diff --git a/sci-libs/vtk/files/vtk-6.0.0-system.patch b/sci-libs/vtk/files/vtk-6.0.0-system.patch
deleted file mode 100644
index 3e5762f..0000000
--- a/sci-libs/vtk/files/vtk-6.0.0-system.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up VTK6.0.0/CMake/vtkModuleMacros.cmake.system VTK6.0.0/CMake/vtkModuleMacros.cmake
---- VTK6.0.0/CMake/vtkModuleMacros.cmake.system 2013-06-12 13:47:10.000000000 -0600
-+++ VTK6.0.0/CMake/vtkModuleMacros.cmake 2013-12-27 20:59:39.548152746 -0700
-@@ -613,7 +613,7 @@ macro(vtk_module_third_party _pkg)
- message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES")
- endif()
-
-- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF)
-+ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES})
- mark_as_advanced(VTK_USE_SYSTEM_${_upper})
-
- if(VTK_USE_SYSTEM_${_upper})
-diff -up VTK6.0.0/CMakeLists.txt.system VTK6.0.0/CMakeLists.txt
---- VTK6.0.0/CMakeLists.txt.system 2013-06-12 13:47:10.000000000 -0600
-+++ VTK6.0.0/CMakeLists.txt 2013-12-27 20:59:39.548152746 -0700
-@@ -107,6 +107,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I
- set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen)
-
- #-----------------------------------------------------------------------------
-+# Do we try to use system libraries by default?
-+OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF)
-+MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES)
-+
-+#-----------------------------------------------------------------------------
- # The third party macros are still used in one or two third party builds.
- include(vtkThirdParty)
-
diff --git a/sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch b/sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch
deleted file mode 100644
index f310479..0000000
--- a/sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up VTK6.0.0/Wrapping/Python/CMakeLists.txt.vtkpython VTK6.0.0/Wrapping/Python/CMakeLists.txt
---- VTK6.0.0/Wrapping/Python/CMakeLists.txt.vtkpython 2013-06-12 13:47:10.000000000 -0600
-+++ VTK6.0.0/Wrapping/Python/CMakeLists.txt 2013-07-26 16:44:19.954295281 -0600
-@@ -371,3 +371,8 @@ endif()
-
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in
- ${CMAKE_CURRENT_BINARY_DIR}/setup.py @ONLY IMMEDIATE)
-+
-+if(NOT VTK_INSTALL_NO_RUNTIME AND NOT VTK_INSTALL_NO_PYTHON)
-+ install(TARGETS vtkpython ${VTKPYTHON_EXECUTABLE}
-+ DESTINATION ${VTK_INSTALL_RUNTIME_DIR})
-+endif()
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
deleted file mode 100644
index 3c01f80..0000000
--- a/sci-libs/vtk/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>sci</herd>
- <herd>java</herd>
- <maintainer>
- <email>jlec@gentoo.org</email>
- <name>Justin Lecher</name>
- </maintainer>
- <use>
- <flag name="boost">Add support for boost</flag>
- <flag name="cg">Use nvidia's cg shaders</flag>
- <flag name="imaging">Building Imaging modules</flag>
- <flag name="offscreen">Offscreen rendering through OSMesa</flag>
- <flag name="rendering">Building Redering modules</flag>
- <flag name="views">Building Views modules</flag>
- <flag name="R">Enable support for dev-lang/R</flag>
- </use>
-</pkgmetadata>
diff --git a/sci-libs/vtk/vtk-6.0.0.ebuild b/sci-libs/vtk/vtk-6.0.0.ebuild
deleted file mode 100644
index 4372909..0000000
--- a/sci-libs/vtk/vtk-6.0.0.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qt4-r2 versionator toolchain-funcs cmake-utils virtualx
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="http://www.vtk.org/"
-SRC_URI="
- http://www.${PN}.org/files/release/${SPV}/${P/_rc/.rc}.tar.gz
- doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="
- aqua boost cg doc examples imaging ffmpeg java mpi mysql odbc
- offscreen postgres python qt4 rendering test theora tk tcl
- video_cards_nvidia views R +X"
-
-REQUIRED_USE="
- java? ( qt4 )
- python? ( ${PYTHON_REQUIRED_USE} )
- tcl? ( rendering )
- test? ( python )
- tk? ( tcl )
- ^^ ( X aqua offscreen )"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/libxml2:2
- media-libs/freetype
- media-libs/libpng
- media-libs/mesa
- media-libs/libtheora
- media-libs/tiff
- sci-libs/exodusii
- sci-libs/hdf5
- sci-libs/netcdf-cxx:3
- sys-libs/zlib
- virtual/jpeg
- virtual/opengl
- x11-libs/gl2ps
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXt
- boost? ( >=dev-libs/boost-1.40.0[mpi?] )
- cg? ( media-gfx/nvidia-cg-toolkit )
- examples? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- sci-libs/vtkdata
- )
- ffmpeg? ( virtual/ffmpeg )
- java? ( >=virtual/jre-1.5 )
- mpi? ( virtual/mpi[cxx,romio] )
- mysql? ( virtual/mysql )
- odbc? ( dev-db/unixODBC )
- offscreen? ( media-libs/mesa[osmesa] )
- postgres? ( dev-db/postgresql-base )
- python? (
- ${PYTHON_DEPS}
- dev-python/sip[${PYTHON_USEDEP}]
- )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- dev-qt/qtsql:4
- dev-qt/qtwebkit:4
- python? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
- )
- tcl? ( dev-lang/tcl )
- tk? ( dev-lang/tk )
- video_cards_nvidia? ( media-video/nvidia-settings )
- R? ( dev-lang/R )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- java? ( >=virtual/jdk-1.5 )
- test? ( sci-libs/vtkdata )"
-
-S="${WORKDIR}"/VTK${PV}
-
-PATCHES=(
- "${FILESDIR}"/${P}-cg-path.patch
- "${FILESDIR}"/${P}-install.patch
- "${FILESDIR}"/${P}-system.patch
- "${FILESDIR}"/${P}-netcdf.patch
- "${FILESDIR}"/${P}-vtkpython.patch
- )
-
-RESTRICT=test
-
-pkg_setup() {
- use java && java-pkg-opt-2_pkg_setup
- use python && python-single-r1_pkg_setup
-
- append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-}
-
-src_prepare() {
- sed \
- -e 's:libproj4:libproj:g' \
- -e 's:lib_proj.h:lib_abi.h:g' \
- -i CMake/FindLIBPROJ4.cmake || die
-
- local x
- for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png tiff zlib; do
- rm -r ThirdParty/${x}/vtk${x} || die
- done
-
- if use examples || use test; then
- # Replace relative path ../../../VTKData with
- # otherwise it will break on symlinks.
- grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \
- sed \
- -e "s|\.\./\.\./\.\./\.\./VTKData|${EPREFIX}/usr/share/vtk/data|g" \
- -e "s|\.\./\.\./\.\./\.\./\.\./VTKData|${EPREFIX}/usr/share/vtk/data|g" \
- -i || die
- fi
-
- use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # general configuration
- local mycmakeargs=(
- -Wno-dev
-# -DCMAKE_SKIP_RPATH=YES
- -DVTK_DIR="${S}"
- -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
- -DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
- -DVTK_CUSTOM_LIBRARY_SUFFIX=""
- -DBUILD_SHARED_LIBS=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_FreeType=ON
- -DVTK_USE_SYSTEM_GL2PS=ON
- -DVTK_USE_SYSTEM_HDF5=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_LIBPROJ4=OFF
-# -DLIBPROJ4_DIR="${EPREFIX}/usr"
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_SYSTEM_LibXml2=ON
- -DVTK_USE_SYSTEM_NETCDF=ON
- -DVTK_USE_SYSTEM_OGGTHEORA=ON
- -DVTK_USE_SYSTEM_PNG=ON
- -DVTK_USE_SYSTEM_TIFF=ON
-# -DVTK_USE_SYSTEM_XDMF2=ON
- -DVTK_USE_SYSTEM_ZLIB=ON
- -DVTK_USE_SYSTEM_LIBRARIES=ON
- -DVTK_USE_GL2PS=ON
- -DVTK_USE_PARALLEL=ON
- )
-
- mycmakeargs+=(
- -DVTK_EXTRA_COMPILER_WARNINGS=ON
- -DVTK_Group_StandAlone=ON
- )
-
- mycmakeargs+=(
- $(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use_build examples EXAMPLES)
- $(cmake-utils_use_build test TESTING)
- $(cmake-utils_use_build test VTK_BUILD_ALL_MODULES_FOR_TESTS)
- $(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
- $(cmake-utils_use imaging VTK_Group_Imaging)
- $(cmake-utils_use mpi VTK_Group_MPI)
- $(cmake-utils_use qt4 VTK_Group_Qt)
- $(cmake-utils_use rendering VTK_Group_Rendering)
- $(cmake-utils_use tk VTK_Group_Tk)
- $(cmake-utils_use views VTK_Group_Views)
- $(cmake-utils_use java VTK_WRAP_JAVA)
- $(cmake-utils_use python VTK_WRAP_PYTHON)
- $(cmake-utils_use python VTK_WRAP_PYTHON_SIP)
- $(cmake-utils_use tcl VTK_WRAP_TCL)
-# -DVTK_BUILD_ALL_MODULES=ON
- )
-
- mycmakeargs+=(
- $(cmake-utils_use boost VTK_USE_BOOST)
- $(cmake-utils_use cg VTK_USE_CG_SHADERS)
- $(cmake-utils_use odbc VTK_USE_ODBC)
- $(cmake-utils_use offscreen VTK_USE_OFFSCREEN)
- $(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA)
- $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER)
- $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
- $(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL)
- $(cmake-utils_use R Module_vtkFiltersStatisticsGnuR)
- $(cmake-utils_use X VTK_USE_X)
- )
-
- # Apple stuff, does it really work?
- mycmakeargs+=( $(cmake-utils_use aqua VTK_USE_COCOA) )
-
- if use java; then
-# local _ejavahome=${EPREFIX}/etc/java-config-2/current-system-vm
-#
-# mycmakeargs+=(
-# -DJAVAC=${EPREFIX}/usr/bin/javac
-# -DJAVAC=$(java-config -c)
-# -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
-# -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include
-# -DJAVA_INCLUDE_PATH2:PATH=${JAVA_HOME}/include/linux
-# )
-#
- if [ "${ARCH}" == "amd64" ]; then
- mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so;${JAVA_HOME}/jre/lib/${ARCH}/xawt/libmawt.so" )
- else
- mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/i386/libjawt.so;${JAVA_HOME}/jre/lib/i386/xawt/libmawt.so" )
- fi
- fi
- if use python; then
- mycmakeargs+=(
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
- -DSIP_INCLUDE_DIR="$(python_get_includedir)"
- -DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
- -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${PREFIX} --root=${D}"
- )
- fi
-
- if use qt4; then
- mycmakeargs+=(
- -DVTK_USE_QVTK=ON
- -DVTK_USE_QVTK_OPENGL=ON
- -DVTK_USE_QVTK_QTOPENGL=ON
- -DQT_WRAP_CPP=ON
- -DQT_WRAP_UI=ON
- -DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/designer
- -DDESIRED_QT_VERSION=4
- -DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc"
- -DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic"
- -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4"
- -DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake"
- )
- fi
-
- if use R; then
- mycmakeargs+=(
-# -DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas)
-# -DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
- -DR_LIBRARY_BLAS=/usr/lib64/R/lib/libR.so
- -DR_LIBRARY_LAPACK=/usr/lib64/R/lib/libR.so
- )
- fi
-
- cmake-utils_src_configure
-
- cat >> "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh <<- EOF
- #!${EPREFIX}/bin/bash
-
- export LD_LIBRARY_PATH="${BUILD_DIR}"/lib
- "${BUILD_DIR}"/bin/vtkProcessShader \$@
- EOF
- chmod 750 "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh || die
-}
-
-src_test() {
- local tcllib
- ln -sf "${BUILD_DIR}"/lib "${BUILD_DIR}"/lib/Release || die
- for tcllib in "${BUILD_DIR}"/lib/lib*TCL*so; do
- ln -sf $(basename "${tcllib}").1 "${tcllib/.so/-${SPV}.so}" || die
- done
- export LD_LIBRARY_PATH="${BUILD_DIR}"/lib:"${JAVA_HOME}"/jre/lib/${ARCH}/:"${JAVA_HOME}"/jre/lib/${ARCH}/xawt/
- local VIRTUALX_COMMAND="cmake-utils_src_test"
-# local VIRTUALX_COMMAND="cmake-utils_src_test -R Java"
-# local VIRTUALX_COMMAND="cmake-utils_src_test -I 364,365"
- virtualmake
-}
-
-src_install() {
- # install docs
- HTML_DOCS=( "${S}"/README.html )
-
- cmake-utils_src_install
-
- use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
-
- if use tcl; then
- # install Tcl docs
- docinto vtk_tcl
- dodoc "${S}"/Wrapping/Tcl/README
- fi
-
- # install examples
- if use examples; then
- insinto /usr/share/${PN}
- mv -v Examples examples || die
- doins -r examples
- fi
-
- #install big docs
- if use doc; then
- cd "${WORKDIR}"/html || die
- rm -f *.md5 || die "Failed to remove superfluous hashes"
- einfo "Installing API docs. This may take some time."
- insinto "/usr/share/doc/${PF}/api-docs"
- doins -r ./*
- fi
-
- # environment
- 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}
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/vtk/files/, sci-libs/vtk/
@ 2023-05-02 12:52 Andrew Ammerlaan
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2023-05-02 12:52 UTC (permalink / raw
To: gentoo-commits
commit: 6fa1c0a79bf4c37e14fe2a97f3c9ec6589e95548
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue May 2 12:52:40 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue May 2 12:52:40 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=6fa1c0a7
sci-libs/vtk: remove duplicate
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
...0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch | 18 -
...r-compute_arch-if-CUDA-toolkit-11-is-used.patch | 32 -
...-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch | 141 -----
...-or-scope-struct-names-to-avoid-conflicts.patch | 127 ----
.../files/vtk-9.1.0-adjust-to-find-binaries.patch | 25 -
...-avoid-naming-collision-with-netcdf-4.9.0.patch | 26 -
sci-libs/vtk/metadata.xml | 42 --
sci-libs/vtk/vtk-9.1.0-r6.ebuild | 641 ---------------------
8 files changed, 1052 deletions(-)
diff --git a/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644
index b46748735..000000000
--- a/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in.orig 2019-01-30 18:15:13.000000000 +0100
-+++ VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in 2020-10-17 00:03:32.730820908 +0200
-@@ -20,6 +20,15 @@
-
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+# ifdef __cplusplus
-+# define FT_CALLBACK_DEF( x ) extern "C" x
-+# else
-+# define FT_CALLBACK_DEF( x ) static x
-+# endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/sci-libs/vtk/files/vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch b/sci-libs/vtk/files/vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
deleted file mode 100644
index 2514dac63..000000000
--- a/sci-libs/vtk/files/vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 33d9b7ded14ce36e3f63810f3403623ee5c2059c Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 10 Jan 2021 20:29:56 +0100
-Subject: [PATCH] fix kepler compute_arch if CUDA toolkit >=11 is used.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- .../vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake b/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake
-index ff0b2581..e565e783 100644
---- a/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake
-+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake
-@@ -229,8 +229,12 @@ if(VTKm_ENABLE_CUDA)
- if(VTKm_CUDA_Architecture STREQUAL "fermi")
- set(arch_flags --generate-code=arch=compute_20,code=sm_20)
- elseif(VTKm_CUDA_Architecture STREQUAL "kepler")
-- set(arch_flags --generate-code=arch=compute_30,code=sm_30
-- --generate-code=arch=compute_35,code=sm_35)
-+ if(CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.0)
-+ set(arch_flags --generate-code=arch=compute_30,code=sm_30
-+ --generate-code=arch=compute_35,code=sm_35)
-+ else()
-+ set(arch_flags --generate-code=arch=compute_35,code=sm_35)
-+ endif()
- elseif(VTKm_CUDA_Architecture STREQUAL "maxwell")
- set(arch_flags --generate-code=arch=compute_50,code=sm_50)
- elseif(VTKm_CUDA_Architecture STREQUAL "pascal")
---
-2.30.0
-
diff --git a/sci-libs/vtk/files/vtk-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch b/sci-libs/vtk/files/vtk-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
deleted file mode 100644
index 276831d84..000000000
--- a/sci-libs/vtk/files/vtk-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From https://gitlab.kitware.com/ben.boeckel/vtk/-/commit/bad8f3e9d0aad03e8f2aff9524cb3c5f2d10ccaf
-From: Ben Boeckel <ben.boeckel@kitware.com>
-Date: Fri, 28 Jan 2022 10:44:28 -0500
-Subject: [PATCH] IO/FFMPEG: support FFmpeg 5.0 API changes
-
-Fixes: #18445
---- /dev/null
-+++ b/Documentation/release/dev/ffmpeg-5.0.md
-@@ -0,0 +1,3 @@
-+## FFmpeg 5.0 support
-+
-+FFmpeg 5.0 API changes are now supported.
---- a/IO/FFMPEG/CMakeLists.txt
-+++ b/IO/FFMPEG/CMakeLists.txt
-@@ -6,7 +6,9 @@ vtk_module_find_package(
- avformat
- avcodec
- avutil
-- swscale)
-+ swscale
-+ OPTIONAL_COMPONENTS
-+ swresample)
-
- set(classes
- vtkFFMPEGWriter)
-@@ -21,6 +23,17 @@ if (NOT FFMPEG_VERSION VERSION_LESS "3.1")
- vtkFFMPEGVideoSource)
- endif ()
-
-+set(ffmpeg_libraries)
-+if (NOT FFMPEG_VERSION VERSION_LESS "5.0")
-+ if (NOT FFMPEG_swresample_FOUND)
-+ message(FATAL_ERROR
-+ "FFMPEG 5.0 requires the `swresample` library.")
-+ endif ()
-+
-+ list(APPEND ffmpeg_libraries
-+ FFMPEG::swresample)
-+endif ()
-+
- vtk_module_add_module(VTK::IOFFMPEG
- CLASSES ${classes})
- vtk_module_link(VTK::IOFFMPEG
-@@ -28,4 +41,5 @@ vtk_module_link(VTK::IOFFMPEG
- FFMPEG::avformat
- FFMPEG::avcodec
- FFMPEG::avutil
-- FFMPEG::swscale)
-+ FFMPEG::swscale
-+ ${ffmpeg_libraries})
---- a/IO/FFMPEG/vtkFFMPEGVideoSource.cxx
-+++ b/IO/FFMPEG/vtkFFMPEGVideoSource.cxx
-@@ -205,7 +205,7 @@ void vtkFFMPEGVideoSource::Initialize()
-
- this->Internal->VideoStream = fcontext->streams[this->Internal->VideoStreamIndex];
-
-- AVCodec* dec = avcodec_find_decoder(this->Internal->VideoStream->codecpar->codec_id);
-+ const AVCodec* dec = avcodec_find_decoder(this->Internal->VideoStream->codecpar->codec_id);
- if (!dec)
- {
- vtkErrorMacro("Failed to find codec for video");
-@@ -271,7 +271,7 @@ void vtkFFMPEGVideoSource::Initialize()
- {
- this->Internal->AudioStream = fcontext->streams[this->Internal->AudioStreamIndex];
-
-- AVCodec* adec = avcodec_find_decoder(this->Internal->AudioStream->codecpar->codec_id);
-+ const AVCodec* adec = avcodec_find_decoder(this->Internal->AudioStream->codecpar->codec_id);
- if (!adec)
- {
- vtkErrorMacro("Failed to find codec for audio");
---- a/IO/FFMPEG/vtkFFMPEGWriter.cxx
-+++ b/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -21,10 +21,17 @@
-
- extern "C"
- {
-+#include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libswscale/swscale.h>
- }
-
-+#if LIBAVFORMAT_VERSION_MAJOR < 59
-+#define vtk_ff_const59
-+#else
-+#define vtk_ff_const59 const
-+#endif
-+
- #if defined(LIBAVFORMAT_VERSION_MAJOR) && LIBAVFORMAT_VERSION_MAJOR >= 57
- extern "C"
- {
-@@ -51,7 +58,7 @@ private:
-
- AVFormatContext* avFormatContext;
-
-- AVOutputFormat* avOutputFormat;
-+ vtk_ff_const59 AVOutputFormat* avOutputFormat;
-
- AVStream* avStream;
-
-@@ -115,15 +122,9 @@ int vtkFFMPEGWriterInternal::Start()
- return 0;
- }
-
-- if (this->Writer->GetCompression())
-- {
-- // choose a codec that is easily playable on windows
-- this->avOutputFormat->video_codec = AV_CODEC_ID_MJPEG;
-- }
-- else
-- {
-- this->avOutputFormat->video_codec = AV_CODEC_ID_RAWVIDEO;
-- }
-+ enum AVCodecID video_codec = this->Writer->GetCompression()
-+ ? AV_CODEC_ID_MJPEG // choose a codec that is easily playable on windows
-+ : AV_CODEC_ID_RAWVIDEO;
-
- // create the format context that wraps all of the media output structures
- if (avformat_alloc_output_context2(
-@@ -133,8 +134,8 @@ int vtkFFMPEGWriterInternal::Start()
- return 0;
- }
-
-- AVCodec* codec;
-- if (!(codec = avcodec_find_encoder(this->avOutputFormat->video_codec)))
-+ vtk_ff_const59 AVCodec* codec;
-+ if (!(codec = avcodec_find_encoder(video_codec)))
- {
- vtkGenericWarningMacro(<< "Failed to get video codec.");
- return 0;
-@@ -155,7 +156,7 @@ int vtkFFMPEGWriterInternal::Start()
- return 0;
- }
-
-- this->avStream->codecpar->codec_id = static_cast<AVCodecID>(this->avOutputFormat->video_codec);
-+ this->avStream->codecpar->codec_id = video_codec;
- this->avStream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
- this->avStream->codecpar->width = this->Dim[0];
- this->avStream->codecpar->height = this->Dim[1];
---
-2.35.1
-
diff --git a/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch b/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
deleted file mode 100644
index 24804ca2d..000000000
--- a/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From https://gitlab.kitware.com/vtk/vtk/-/commit/0322b938968eebee585ad7efb93bbdade7106355
-
-https://bugs.gentoo.org/863038
-https://gitlab.kitware.com/vtk/vtk/-/issues/18638
-
-From: Aron Helser <aron.helser@kitware.com>
-Date: Mon, 15 Aug 2022 10:06:13 -0400
-Subject: [PATCH 16/30] Change or scope struct names to avoid conflicts.
-
-(cherry picked from commit b79eb46bf5a4277cafc1ed2bd47fd3ffc28a5b3f)
---- a/IO/AMR/vtkAMRFlashReader.cxx
-+++ b/IO/AMR/vtkAMRFlashReader.cxx
-@@ -153,7 +153,7 @@ void vtkAMRFlashReader::ComputeStats(
-
- for (int i = 0; i < internal->NumberOfBlocks; ++i)
- {
-- Block& theBlock = internal->Blocks[i];
-+ FlashReaderBlock& theBlock = internal->Blocks[i];
- double* gridMin = theBlock.MinBounds;
- if (gridMin[0] < min[0])
- {
-@@ -193,7 +193,7 @@ int vtkAMRFlashReader::FillMetaData()
-
- for (int i = 0; i < this->Internal->NumberOfBlocks; ++i)
- {
-- Block& theBlock = this->Internal->Blocks[i];
-+ FlashReaderBlock& theBlock = this->Internal->Blocks[i];
-
- // Start numbering levels from 0!
- int level = this->Internal->Blocks[i].Level - 1;
---- a/IO/AMR/vtkAMRFlashReaderInternal.cxx
-+++ b/IO/AMR/vtkAMRFlashReaderInternal.cxx
-@@ -692,7 +692,7 @@ void vtkFlashReaderInternal::GetBlockMinMaxGlobalDivisionIds()
-
- for (int b = 0; b < this->NumberOfBlocks; b++)
- {
-- Block& B = this->Blocks[b];
-+ FlashReaderBlock& B = this->Blocks[b];
-
- for (int d = 0; d < 3; d++)
- {
---- a/IO/AMR/vtkAMRFlashReaderInternal.h
-+++ b/IO/AMR/vtkAMRFlashReaderInternal.h
-@@ -74,7 +74,7 @@ typedef struct tagFlashReaderSimulationParameters
- double RedShift;
- } FlashReaderSimulationParameters;
-
--typedef struct tagBlock
-+typedef struct tagFlashReaderBlock
- {
- int Index; // Id of the block
- int Level; // LOD level
-@@ -88,7 +88,7 @@ typedef struct tagBlock
- double Center[3]; // center of the block
- double MinBounds[3]; // lower left of the bounding box
- double MaxBounds[3]; // upper right of the bounding box
--} Block;
-+} FlashReaderBlock;
-
- typedef struct tagFlashReaderSimulationInformation
- {
-@@ -152,7 +152,7 @@ public:
- FlashReaderSimulationInformation SimulationInformation; // CFD simulation
-
- // blocks
-- std::vector<Block> Blocks;
-+ std::vector<FlashReaderBlock> Blocks;
- std::vector<int> LeafBlocks;
- std::vector<std::string> AttributeNames;
-
---- a/IO/AMR/vtkAMRVelodyneReader.cxx
-+++ b/IO/AMR/vtkAMRVelodyneReader.cxx
-@@ -219,7 +219,7 @@ int vtkAMRVelodyneReader::FillMetaData()
- double spacing[3];
- for (int i = 0; i < this->Internal->nBlocks; i++)
- {
-- Block& theBlock = this->Internal->Blocks[i];
-+ vtkAMRVelodyneReaderInternal::Block& theBlock = this->Internal->Blocks[i];
- int level = theBlock.Level;
- int id = theBlock.Index;
- CalculateBlockDims(this->Internal->blockDims.data(), theBlock.isFull, dims);
-@@ -243,7 +243,7 @@ vtkUniformGrid* vtkAMRVelodyneReader::GetAMRGrid(const int blockIdx)
- {
- return nullptr;
- }
-- Block& theBlock = this->Internal->Blocks[blockIdx];
-+ vtkAMRVelodyneReaderInternal::Block& theBlock = this->Internal->Blocks[blockIdx];
- int dims[3];
- CalculateBlockDims(this->Internal->blockDims.data(), theBlock.isFull, dims);
- vtkUniformGrid* ug = vtkUniformGrid::New();
---- a/IO/AMR/vtkAMRVelodyneReaderInternal.h
-+++ b/IO/AMR/vtkAMRVelodyneReaderInternal.h
-@@ -48,24 +48,20 @@
- //================================================================================
- // INTERNAL VELODYNE READER
- //================================================================================
--typedef struct tagVelodyneSimParameters
--{
-- double Time;
-- int CycleTime;
--} VelodneSimParameters;
-
--typedef struct tagBlock
--{
-- int Index;
-- int dSetLoc;
-- int Level;
-- double Origin[3];
-- bool isFull;
-- bool isLeaf;
--} Block;
- class vtkAMRVelodyneReaderInternal
- {
- public:
-+ typedef struct tagVelodyneBlock
-+ {
-+ int Index;
-+ int dSetLoc;
-+ int Level;
-+ double Origin[3];
-+ bool isFull;
-+ bool isLeaf;
-+ } Block;
-+
- vtkAMRVelodyneReaderInternal();
- ~vtkAMRVelodyneReaderInternal();
- void SetFileName(VTK_FILEPATH VTK_FUTURE_CONST char* fileName);
diff --git a/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch b/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch
deleted file mode 100644
index 10d6d251e..000000000
--- a/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e59b8ff7b83cd6a58c226cb4f5d9661bcb29002b Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Thu, 31 Mar 2022 08:05:17 +0200
-Subject: [PATCH] adjust to find binaries
-
-Add compatibility for qt-5.15.3 with no qtchooser installed. QtCore exports
-Qt5::{qmake,moc,rcc} which we use to get the path for binaries.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/GUISupport/QtQuick/qml/CMakeLists.txt
-+++ b/GUISupport/QtQuick/qml/CMakeLists.txt
-@@ -60,8 +60,8 @@ file(GENERATE
- # Generate the qmltypes file for the VTK QML plugin
-
- # First, find the qmlplugindump executable
--get_target_property(qt_core_location "Qt${vtk_qt_major_version}::Core" LOCATION)
--get_filename_component(qt_bin_dir "${qt_core_location}" PATH)
-+get_target_property(qt_qmake_location "Qt${vtk_qt_major_version}::qmake" LOCATION)
-+get_filename_component(qt_bin_dir "${qt_qmake_location}" PATH)
- if (APPLE)
- get_filename_component(qt_bin_dir "${qt_bin_dir}" PATH)
- endif ()
---
-2.35.1
-
diff --git a/sci-libs/vtk/files/vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch b/sci-libs/vtk/files/vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch
deleted file mode 100644
index 7549c240e..000000000
--- a/sci-libs/vtk/files/vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/851594
-
-From b155e9716a1cf4a03948c01f49c4097e466da4f0 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 20 Jun 2022 07:07:19 +0200
-Subject: [PATCH] avoid naming collision with netcdf-4.9.0
-
-The identifier has already been #defined with netcdf-4.9.0. To avoid
-conflicts guard the declaration.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
-+++ b/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
-@@ -1770,7 +1770,9 @@ void ex__compress_variable(int exoid, int varid, int type)
- */
-
- /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */
-+#ifndef NC_SZIP_NN
- const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */
-+#endif
- /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */
- const int SZIP_PIXELS_PER_BLOCK =
- file->compression_level == 0 ? 32 : file->compression_level;
---
-2.35.1
-
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
deleted file mode 100644
index d047994a2..000000000
--- a/sci-libs/vtk/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project" proxied="proxy">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <maintainer type="person" proxied="yes">
- <email>waebbl-gentoo@posteo.net</email>
- <name>Bernd Waibel</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <description>Gentoo Proxy Maintainers</description>
- </maintainer>
- <use>
- <flag name="all-modules">Build all modules</flag>
- <flag name="boost">Add support for boost</flag>
- <flag name="cuda">Add support for CUDA</flag>
- <flag name="freetype">Build support for font rendering</flag>
- <flag name="gdal">Support for gdal formated data</flag>
- <flag name="imaging">Building Imaging modules</flag>
- <flag name="json">Support for json formatted data</flag>
- <flag name="kits">Build kits in addition to modules</flag>
- <flag name="las">Build support for LiDAR files</flag>
- <flag name="logging">Build the logging module</flag>
- <flag name="offscreen">Offscreen rendering through OSMesa</flag>
- <flag name="openvdb">Build support to handle VDB data files</flag>
- <flag name="pdal">Build support to handle point cloud data files</flag>
- <flag name="pegtl">Use pegtl to build parsers</flag>
- <flag name="qt6">Use Qt6 packages instead of Qt5</flag>
- <flag name="rendering">Building Redering modules</flag>
- <flag name="sdl">Enable SDL2 support for rendering modules</flag>
- <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
- <flag name="views">Building Views modules</flag>
- <flag name="vtkm">Build the vtkm accelerations modules</flag>
- <flag name="web">Install web component</flag>
- </use>
- <upstream>
- <remote-id type="github">Kitware/VTK</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sci-libs/vtk/vtk-9.1.0-r6.ebuild b/sci-libs/vtk/vtk-9.1.0-r6.ebuild
deleted file mode 100644
index 47c9d92e8..000000000
--- a/sci-libs/vtk/vtk-9.1.0-r6.ebuild
+++ /dev/null
@@ -1,641 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO:
-# - add USE flag for remote modules? Those modules can be downloaded
-# properly before building.
-# - replace usex by usev once we bump to EAPI 8
-
-PYTHON_COMPAT=( python3_10 )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-inherit check-reqs cmake cuda java-pkg-opt-2 python-single-r1 toolchain-funcs virtualx webapp
-
-# Short package version
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
- https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz
- https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz
- https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz
- doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz )
- examples? (
- https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
- https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
- )
- test? (
- https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
- https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
- )
-"
-S="${WORKDIR}/VTK-${PV}"
-
-LICENSE="BSD LGPL-2"
-SLOT="0/${MY_PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-# TODO: Like to simplifiy these. Mostly the flags related to Groups, plus
-# maybe some flags related to Kits and a few other needed flags.
-IUSE="all-modules +boost cuda debug doc examples +ffmpeg +gdal imaging java
- logging mpi mysql odbc openmp postgres python qt5 qt6 +rendering tbb test
- +threads tk video_cards_nvidia views web"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- all-modules? (
- boost ffmpeg gdal imaging mysql odbc postgres rendering views
- || ( qt5 qt6 )
- )
- cuda? ( video_cards_nvidia )
- java? ( rendering )
- python? ( ${PYTHON_REQUIRED_USE} )
- qt5? ( rendering )
- qt6? ( rendering )
- tk? ( rendering python )
- web? ( python )
-"
-
-RDEPEND="
- app-arch/lz4:=
- app-arch/xz-utils
- dev-db/sqlite:3
- dev-libs/double-conversion:=
- dev-libs/expat
- dev-libs/icu:=
- dev-libs/jsoncpp:=
- >=dev-libs/libfmt-8.1.1:=
- dev-libs/libxml2:2
- dev-libs/libzip:=
- dev-libs/pugixml
- media-libs/freetype
- media-libs/libogg
- media-libs/libpng:=
- media-libs/libtheora
- media-libs/tiff:=
- >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=]
- sci-libs/hdf5:=[mpi=]
- sci-libs/netcdf:=[mpi=]
- sys-libs/zlib
- media-libs/libjpeg-turbo
- all-modules? ( sci-geosciences/liblas[gdal] )
- boost? ( dev-libs/boost:=[mpi?] )
- cuda? ( dev-util/nvidia-cuda-toolkit:= )
- ffmpeg? ( media-video/ffmpeg:= )
- gdal? ( sci-libs/gdal:= )
- java? ( >=virtual/jdk-1.8:* )
- mpi? (
- media-libs/glew:=
- sys-cluster/openmpi[cxx,romio]
- virtual/opengl
- )
- mysql? ( dev-db/mariadb-connector-c )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-qt/qtquickcontrols2:5
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- )
- qt6? (
- dev-qt/qtbase:6[gui,opengl,sql,widgets]
- dev-qt/qtdeclarative:6[opengl]
- dev-qt/qtshadertools:6
- )
- rendering? (
- media-libs/freeglut
- media-libs/glew:=
- media-libs/libsdl2
- sci-libs/proj:=
- virtual/opengl
- x11-libs/gl2ps
- x11-libs/libXcursor
- )
- tbb? ( <dev-cpp/tbb-2021.4.0:= )
- tk? ( dev-lang/tk:= )
- video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
- views? (
- x11-libs/libICE
- x11-libs/libXext
- )
- web? ( ${WEBAPP_DEPEND} )
- python? (
- $(python_gen_cond_dep '
- boost? ( dev-libs/boost:=[mpi?,python?,${PYTHON_USEDEP}] )
- mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
- ')
- gdal? ( sci-libs/gdal:=[python?,${PYTHON_SINGLE_USEDEP}] )
- )
-"
-
-DEPEND="
- ${RDEPEND}
- dev-cpp/eigen
- <dev-libs/pegtl-3
- dev-libs/utfcpp
-"
-BDEPEND="
- virtual/pkgconfig
- mpi? ( app-admin/chrpath )
- test? (
- media-libs/glew
- virtual/opengl
- x11-libs/libXcursor
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
- "${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
- "${FILESDIR}"/${PN}-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
- "${FILESDIR}"/${P}-adjust-to-find-binaries.patch
- "${FILESDIR}"/${P}-avoid-naming-collision-with-netcdf-4.9.0.patch
- "${FILESDIR}"/${P}-Change-or-scope-struct-names-to-avoid-conflicts.patch
-)
-
-DOCS=( CONTRIBUTING.md README.md )
-
-# based on default settings
-CHECKREQS_DISK_BUILD="4G"
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp
-
- if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then
- # FIXME: better use eerror?
- ewarn "GCC 11 is know to fail building with CUDA support in some cases."
- ewarn "See bug #820593"
- fi
-
- if use examples || use doc; then
- CHECKREQS_DISK_BUILD="7G"
- fi
-
- if use examples && use doc; then
- CHECKREQS_DISK_BUILD="10G"
- fi
-
- if use cuda; then
- # NOTE: This should actually equal to (number of build jobs)*7G,
- # as any of the cuda compile tasks can take up 7G!
- # 10.2 GiB install directory, 6.4 GiB build directory with max. USE flags
- CHECKREQS_MEMORY="7G"
- CHECKREQS_DISK_BUILD="14G"
- if [[ ${VTK_CUDA_ARCH} = native ]]; then
- eerror "Using native CUDA arches is currently broken."
- eerror "Please set it to one of the common arch names:"
- eerror "kepler, maxwell, pascal, turing or ampere."
- die "Please set VTK_CUDA_ARCH environment variable!"
- fi
- fi
-
- if use qt6 && use qt5; then
- ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
- fi
-
- check-reqs_pkg_setup
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp
-
- if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then
- # FIXME: better use eerror?
- ewarn "GCC 11 is know to fail building with CUDA support in some cases."
- ewarn "See bug #820593"
- fi
-
- if use examples || use doc; then
- CHECKREQS_DISK_BUILD="7G"
- fi
-
- if use examples && use doc; then
- CHECKREQS_DISK_BUILD="10G"
- fi
-
- if use cuda; then
- CHECKREQS_MEMORY="7G"
- CHECKREQS_DISK_BUILD="14G"
- if [[ ${VTK_CUDA_ARCH} = native ]]; then
- eerror "Using native CUDA arches is currently broken."
- eerror "Please set it to one of the common arch names:"
- eerror "kepler, maxwell, pascal, turing or ampere."
- die "Please set VTK_CUDA_ARCH environment variable!"
- fi
- fi
-
- if use qt6 && use qt5; then
- ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
- fi
-
- check-reqs_pkg_setup
-
- use java && java-pkg-opt-2_pkg_setup
- use python && python-single-r1_pkg_setup
- use web && webapp_pkg_setup
-}
-
-src_prepare() {
- # If we have system libraries available use these and delete
- # the respecting files in ${S}/ThirdParty to save some space.
- # Note: The following libraries are marked as internal by kitware
- # and can currently not unbundled:
- # diy2, exodusII, fides, h5part, kissfft, loguru, verdict, vpic,
- # vtkm, xdmf{2,3}, zfp
- # Note: libharu is omitted: vtk needs an updated version (2.4.0)
- # Note: no valid mpi4py target found with system library
- # TODO: cli11 (::guru), exprtk, ioss
- local -a DROPS=( cgns doubleconversion eigen expat fmt freetype hdf5 jpeg jsoncpp
- libxml2 lz4 lzma netcdf ogg pegtl png pugixml sqlite theora tiff utf8
- zlib )
- use rendering && DROPS+=( gl2ps glew libproj )
-
- local x
- for x in ${DROPS[@]}; do
- ebegin "Dropping bundled ${x}"
- rm -r ThirdParty/${x}/vtk${x} || die
- eend $?
- done
- unset x
-
- if use doc; then
- einfo "Removing .md5 files from documents."
- rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
- sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
- -i Utilities/Doxygen/CMakeLists.txt || die
- fi
-
- cmake_src_prepare
-
- if use cuda; then
- cuda_add_sandbox -w
- cuda_src_prepare
- fi
-
- if use test; then
- ebegin "Copying data files to ${BUILD_DIR}"
- mkdir -p "${BUILD_DIR}/ExternalData" || die
- pushd "${BUILD_DIR}/ExternalData" >/dev/null || die
- ln -sf ../../VTK-${PV}/.ExternalData/README.rst . || die
- ln -sf ../../VTK-${PV}/.ExternalData/SHA512 . || die
- popd >/dev/null || die
- eend "$?"
- fi
-}
-
-src_configure() {
-# TODO: check these and consider to use them
-# VTK_BUILD_SCALED_SOA_ARRAYS
-# VTK_DISPATCH_{AOS,SOA,TYPED}_ARRAYS
-
- local mycmakeargs=(
- -DVTK_ANDROID_BUILD=OFF
- -DVTK_IOS_BUILD=OFF
-
- -DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF)
- # we use the pre-built documentation and install these with USE=doc
- -DVTK_BUILD_DOCUMENTATION=OFF
- -DVTK_BUILD_EXAMPLES=$(usex examples ON OFF)
-
- -DVTK_ENABLE_KITS=ON
- -DVTK_ENABLE_LOGGING=$(usex logging ON OFF)
- # defaults to ON: USE flag for this?
- -DVTK_ENABLE_REMOTE_MODULES=OFF
-
- -DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DONT_WANT")
- -DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DONT_WANT")
- -DVTK_GROUP_ENABLE_StandAlone="YES"
- -DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DONT_WANT")
- -DVTK_GROUP_ENABLE_Web=$(usex web "YES" "DONT_WANT")
-
- -DVTK_INSTALL_SDK=ON
-
- -DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT"
- -DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT"
- -DVTK_MODULE_ENABLE_VTK_fmt="YES"
- -DVTK_MODULE_ENABLE_VTK_vtkm="WANT"
-
- # not packaged in Gentoo
- -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
- -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
-
- -DVTK_RELOCATABLE_INSTALL=ON
-
- -DVTK_SMP_ENABLE_OPENMP=$(usex openmp ON OFF)
- -DVTK_SMP_ENABLE_STDTHREAD=$(usex threads ON OFF)
- -DVTK_SMP_ENABLE_TBB=$(usex tbb ON OFF)
-
- -DVTK_USE_CUDA=$(usex cuda ON OFF)
- # use system libraries where possible
- -DVTK_USE_EXTERNAL=ON
- -DVTK_USE_MPI=$(usex mpi ON OFF)
- -DVTK_USE_TK=$(usex tk ON OFF)
- -DVTK_USE_X=ON
-
- -DVTK_WRAP_JAVA=$(usex java ON OFF)
- -DVTK_WRAP_PYTHON=$(usex python ON OFF)
- )
-
- if use all-modules; then
- mycmakeargs+=(
- -DVTK_ENABLE_OSPRAY=OFF
- # TODO: some of these are tied to the VTK_ENABLE_REMOTE_MODULES
- # option. Check whether we can download them clean and enable
- # them.
- -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="DONT_WANT"
- -DVTK_MODULE_ENABLE_VTK_fides="DONT_WANT"
- -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="DONT_WANT"
- -DVTK_MODULE_ENABLE_VTK_IOADIOS2="DONT_WANT"
- -DVTK_MODULE_ENABLE_VTK_IOFides="DONT_WANT"
- -DVTK_MODULE_ENABLE_VTK_IOOpenVDB="DONT_WANT"
- -DVTK_MODULE_ENABLE_VTK_IOPDAL="DONT_WANT"
- -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="DONT_WANT"
-
- # available in ::guru, so avoid detection if installed
- -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
- )
- fi
-
- # TODO: consider removing USE flags and enable by default
- if use boost; then
- mycmakeargs+=(
- -DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT"
- -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT"
- )
- fi
-
- # TODO: checks this on updates of nvidia-cuda-toolkit and update
- # the list of available arches if necessary, i.e. add new arches
- # once they are released at the end of the list before all.
- # See https://en.wikipedia.org/wiki/CUDA#GPUs_supported
- if use cuda; then
- local cuda_arch=
- case ${VTK_CUDA_ARCH:-native} in
- # we ignore fermi arch, because current nvidia-cuda-toolkit-11*
- # no longer supports it
- kepler|maxwell|pascal|volta|turing|ampere|all)
- cuda_arch=${VTK_CUDA_ARCH}
- ;;
- native)
- ewarn "If auto detection fails for you, please try and export the"
- ewarn "VTK_CUDA_ARCH environment variable to one of the common arch"
- ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all."
- cuda_arch=native
- ;;
- *)
- eerror "Please properly set the VTK_CUDA_ARCH environment variable to"
- eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all"
- die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!"
- ;;
- esac
- ewarn "Using CUDA architecture '${cuda_arch}'"
-
- mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} )
- fi
-
- if use debug; then
- mycmakeargs+=(
- -DVTK_DEBUG_LEAKS=ON
- -DVTK_DEBUG_MODULE=ON
- -DVTK_DEBUG_MODLE_ALL=ON
- -DVTK_ENABLE_SANITIZER=ON
- -DVTK_EXTRA_COMPILER_WARNINGS=ON
- -DVTK_WARN_ON_DISPATCH_FAILURE=ON
- )
- if use rendering; then
- mycmakeargs+=( -DVTK_OPENGL_ENABLE_STREAM_ANNOTATIONS=ON )
- fi
- fi
-
- if use examples || use test; then
- mycmakeargs+=( -DVTK_USE_LARGE_DATA=ON )
- fi
-
- # TODO: consider removing the USE flag and enable by default
- if use ffmpeg; then
- mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOFFMPEG="WANT" )
- fi
-
- # TODO: consider removing the USE flag and enable by default
- if use gdal; then
- mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT" )
- fi
-
- if ! use java && ! use python; then
- # defaults to ON
- mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF )
- fi
-
- if use java; then
- mycmakeargs+=(
- -DCMAKE_INSTALL_JARDIR="share/${PN}"
- -DVTK_ENABLE_WRAPPING=ON
- )
- fi
-
- if use mpi; then
- mycmakeargs+=(
- -DVTK_GROUP_ENABLE_MPI="YES"
- -DVTK_MODULE_ENABLE_VTK_IOH5part="WANT"
- -DVTK_MODULE_ENABLE_VTK_IOParallel="WANT"
- -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT"
- -DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT"
- -DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT"
- -DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT"
- -DVTK_MODULE_ENABLE_VTK_h5part="WANT"
- -DVTKm_ENABLE_MPI=ON
- )
- if use python; then
- mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" )
- fi
- fi
-
- if use mysql; then
- mycmakeargs+=(
- -DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT"
- -DVTK_MODULE_ENABLE_VTK_IOSQL="WANT"
- )
- fi
-
- if use odbc; then
- mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" )
- fi
-
- if use postgres; then
- mycmakeargs+=(
- -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT"
- -DVTK_MODULE_ENABLE_VTK_IOSQL="WANT"
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DVTK_ENABLE_WRAPPING=ON
- -DPython3_EXECUTABLE="${PYTHON}"
- -DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages"
- )
- fi
-
- if use qt5 && use qt6; then
- # prefer Qt5: https://wiki.gentoo.org/wiki/Project:qt/Policies
- mycmakeargs+=(
- -DCMAKE_INSTALL_QMLDIR="/usr/$(get_libdir)/qt5/qml"
- -DVTK_QT_VERSION="5"
- )
- else
- if use qt5; then
- mycmakeargs+=(
- -DCMAKE_INSTALL_QMLDIR="/usr/$(get_libdir)/qt5/qml"
- -DVTK_QT_VERSION="5"
- )
- elif use qt6; then
- mycmakeargs+=(
- -DCMAKE_INSTALL_QMLDIR="/usr/$(get_libdir)/qt6/qml"
- -DVTK_QT_VERSION="6"
- )
- else
- mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="DONT_WANT" )
- fi
- fi
-
- if use qt5 || use qt6; then
- mycmakeargs+=(
- -DVTK_GROUP_ENABLE_Qt:STRING="YES"
- -DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT"
- )
- if use mysql || use postgres; then
- mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" )
- fi
- if use rendering; then
- mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" )
- fi
- if use views; then
- mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" )
- fi
- fi
-
- if use rendering || use test || use web || use all-modules; then
- # needs patched version
- mycmakeargs+=( -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF )
- fi
-
- if use rendering; then
- mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT" )
- fi
-
- if use test; then
- ewarn "Testing requires VTK_FORBID_DOWNLOADS=OFF by upstream."
- ewarn "Care has been taken to pre-download all required files."
- ewarn "In case you find missing files, please inform me."
- mycmakeargs+=(
- -DVTK_BUILD_TESTING=ON
- -DVTK_FORBID_DOWNLOADS=OFF
-
- -DVTK_MODULE_ENABLE_VTK_octree="WANT"
- -DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT"
-
- # available in ::guru, so avoid detection if installed
- -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
- )
- else
- mycmakeargs+=(
- -DVTK_BUILD_TESTING=OFF
- -DVTK_FORBID_DOWNLOADS=ON
- )
- fi
-
- # FIXME: upstream provides 4 threading models, as of 9.1.0. These are
- # sequential, stdthread, openmp and tbb. AFAICS all of them can be
- # enabled at the same time. Sequential and Stdthread are enabled by
- # default. The default selected type for the build is sequential.
- # Assuming sequential < stdpthread < openmp < tbb wrt speed, although
- # this is dependent on the actual scenario where threading is used.
- if use tbb; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
- elif use openmp; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="OpenMP" )
- elif use threads; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="STDThread" )
- else
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
- fi
-
- use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
- if use mpi; then
- export CC=mpicc
- export CXX=mpicxx
- export FC=mpif90
- export F90=mpif90
- export F77=mpif77
- fi
-
- cmake_src_configure
-}
-
-# FIXME: avoid nonfatal?
-# see https://github.com/gentoo/gentoo/pull/22878#discussion_r747204043
-src_test() {
-# nonfatal virtx cmake_src_test
- virtx cmake_src_test
-}
-
-src_install() {
- use web && webapp_src_preinst
-
- # Stop web page images from being compressed
- if use doc; then
- HTML_DOCS=( "${WORKDIR}/html/." )
- fi
-
- cmake_src_install
-
- use java && java-pkg_regjar "${ED}"/usr/share/${PN}/${PN}.jar
-
- # install examples
- if use examples; then
- einfo "Installing examples"
- mv -v {E,e}xamples || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
-
- einfo "Installing datafiles"
- insinto /usr/share/${PN}/data
- doins -r "${S}/.ExternalData"
- fi
-
- # with MPI runpath's are not deleted properly
- if use mpi; then
- chrpath -d "${ED}"/usr/$(get_libdir)/*.so.${PV} || die
- fi
-
- use python && python_optimize
-
- use web && webapp_src_install
-
- # Temporary!
- # Avoid collision with paraview.
- # bug #793221
- rm -rf "${ED}"/usr/share/vtkm-1.5/VTKm{LICENSE.txt,README.md} || die
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
- use web && webapp_pkg_postinst
-
- if use examples; then
- einfo "You can get more and updated examples at"
- einfo "https://kitware.github.io/vtk-examples/site/"
- fi
-}
-
-pkg_prerm() {
- use web && webapp_pkg_prerm
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-02 12:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-02 12:52 [gentoo-commits] proj/sci:master commit in: sci-libs/vtk/files/, sci-libs/vtk/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2014-01-18 7:39 Justin Lecher
2013-07-17 17:59 Sebastien Fabbro
2011-04-16 10:51 Justin Lecher
2011-04-16 10:51 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox