From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QB35x-0003ws-Hr for garchives@archives.gentoo.org; Sat, 16 Apr 2011 10:51:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C40241C018; Sat, 16 Apr 2011 10:51:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4B9181C018 for ; Sat, 16 Apr 2011 10:51:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9BC0D1B407D for ; Sat, 16 Apr 2011 10:51:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0C69B8006D for ; Sat, 16 Apr 2011 10:51:09 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/vtk/files/, sci-libs/vtk/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/vtk/ChangeLog sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch sci-libs/vtk/files/vtk-5.6.0-R.patch sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch sci-libs/vtk/files/vtk-5.6.0-cg-path.patch sci-libs/vtk/files/vtk-5.6.0-libpng14.patch sci-libs/vtk/files/vtk-5.6.0-odbc.patch sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch sci-libs/vtk/metadata.xml sci-libs/vtk/vtk-5.6.1.ebuild X-VCS-Directories: sci-libs/vtk/files/ sci-libs/vtk/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: a991aa54202857bf1833536b5dff0097c77ebe70 Date: Sat, 16 Apr 2011 10:51:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 542acf27bbe8727a1a6e9eb45e63145d commit: a991aa54202857bf1833536b5dff0097c77ebe70 Author: Justin Lecher gentoo org> AuthorDate: Sat Apr 16 10:50:52 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Apr 16 10:50:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Da991aa54 Moved to tree Signed-off-by: Justin Lecher 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 vtk-5.6.1.ebuild, - +files/vtk-5.6.1-ffmpeg.patch: - Made ebuild tree ready - - 07 Mar 2011; Justin Lecher vtk-5.6.1.ebuild: - Correct Slots for gtk 3 introduction to tree - - 31 Jan 2011; Fran=C3=A7ois Bissey - vtk-5.6.1.ebuild: - change the handling of python 2.7 - - 29 Jan 2011; Fran=C3=A7ois Bissey - vtk-5.6.1.ebuild: - Complete the removal of FindPythonLibs.cmake, so we don't have a failu= re at - install. - - 29 Dec 2010; Fran=C3=A7ois Bissey vtk-5.6.1.= ebuild: - Patch for python-2.7 as in paraview-3.8.1 - - 09 Nov 2010; Fran=C3=A7ois Bissey vtk-5.6.1.= ebuild: - switch to virtual/jpeg - - 29 Oct 2010; Fran=C3=A7ois Bissey - +files/vtk-5.2.0-tcl-install.patch: - Readd missing patch=20 - - 26 Oct 2010; Fran=C3=A7ois Bissey - +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=C3=A7ois Bissey - +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=C3=A7ois Bissey - +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.pa= tch, - +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.pa= tch, - +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 vtk-5.6.0-r2.ebuild: - Fix for compilation with USE=3Dffmpeg, #327517 - - 11 Jul 2010; Justin Lecher vtk-5.6.0-r2.ebuild, - +files/vtk-5.6.0-odbc.patch: - Imported support for dbs from sci overlay, 327601, thanks yFrancois Bi= ssey - - 17 Jun 2010; Justin Bronder vtk-5.4.2-r1.ebuild= : - Remove sys-cluster/lam-mpi handling, see #324415. - - 09 Jun 2010; Justin Lecher -vtk-5.4.2.ebuild: - removed old version which having problems with PYTHON ABIs stuff - - 07 Jun 2010; Justin Lecher vtk-5.6.0-r2.ebuild: - Fixed ogg -> theora USE transition - - 31 May 2010; Justin Lecher metadata.xml: - Added myself as maintainer - -*vtk-5.6.0-r2 (29 May 2010) - - 29 May 2010; Justin Lecher -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 vtk-5.6.0-r1.ebuild: - Added missing DEPS - - 29 May 2010; Justin Lecher 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 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 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 vtk-5.4.2.ebuild, - vtk-5.4.2-r1.ebuild: - Add x11-libs/qt-sql to deps, #301684 - - 25 Apr 2010; Justin Lecher vtk-5.4.2-r1.ebuild: - Python ABI fixes, #316229 - - 26 Mar 2010; Ben de Groot vtk-5.4.2.ebuild, - vtk-5.4.2-r1.ebuild: - Don't inherit unused qt3 eclass (bug #310669) - - 11 Mar 2010; Samuli Suominen vtk-5.4.2-r1.ebuil= d, - +files/vtk-5.4.2-libpng14.patch: - Fix building with libpng14. - - 11 Feb 2010; Justin Lecher 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 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 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 +vtk-5.4.2-r1.ebuil= d: - 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 for his help. - - 17 Dec 2009; Markus Dittrich vtk-5.4.2.ebuild: - Updated dependency on cmake to >=3D2.6 (fixes bug #295531). - - 04 Dec 2009; Markus Dittrich vtk-5.4.2.ebuild: - Added short notice regarding possible parallel make issues per bug - #244896. - - 24 Nov 2009; Markus Dittrich vtk-5.4.2.ebuild: - Removed boost from RDEPEND (fixes bug #293083). - - 18 Sep 2009; Petteri R=C3=A4ty -vtk-5.0.4.ebui= ld, - -vtk-5.2.0-r1.ebuild: - Remove old versions using built_with_use. - - 01 Sep 2009; Markus Dittrich 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 -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 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 =20 - +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 +vtk-5.2.0.ebuild: - Version bump (fixes bug #238883). Thanks much to Steve Yin - for his ebuild. - - 07 Aug 2008; Ulrich Mueller metadata.xml: - Add USE flag description to metadata wrt GLEP 56. - - 28 Jul 2008; Carsten Lohrke vtk-5.0.3.ebuild: - QA: Get rid of deprecated qt?_min_version(). - - 27 Jul 2008; Carsten Lohrke vtk-5.0.4.ebuild: - Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11. - - 08 Jul 2008; Thomas Anderson vtk-5.0.4.ebuild= : - Add a qt-gui dependency, it really is needed. - - 03 Jul 2008; Thomas Anderson vtk-5.0.4.ebuild= : - Migrate Dependencies to permit Split QT 4.4 to satisfy dependencies, b= ug - #217189 - - 24 May 2008; Markus Dittrich - +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=20 - Bert Karwatzki for his patch. - - 09 Mar 2008; Markus Dittrich vtk-5.0.4.ebuild: - Backported support for tcl/tk-8.5 from cvs head (fixes bug 212700).=20 - Thanks much to Pacho Ramos for=20 - his patch. - -*vtk-5.0.4 (06 Mar 2008) - - 06 Mar 2008; Markus Dittrich +vtk-5.0.4.ebuild: - Version bump. - - 29 Feb 2008; Markus Dittrich vtk-5.0.3.ebuild: - Fixed bogus install location (see bug #211819). Thanks much to - Matthias Langer for his patch. - - 21 Feb 2008; Markus Dittrich - -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 vtk-5.0.3.ebuild: - Fixed incomplete RDEPEND. - - 01 Aug 2007; Markus Dittrich vtk-5.0.3.ebuild: - Added LGPL-2 to LICENSE since it is needed for gl2ps (see bug 146019). - - 22 Jul 2007; Donnie Berkholz ; vtk-5.0.3.ebuild: - Drop virtual/x11 references. - - 11 Jun 2007; Petteri R=C3=A4ty -vtk-5.0.2.ebui= ld: - Remove old version. - - 11 Jun 2007; Petteri R=C3=A4ty vtk-5.0.3.ebuil= d: - Add java? ( >=3Dvirtual/jre-1.5 ) to RDEPEND. - - 28 May 2007; Markus Dittrich vtk-5.0.3.ebuild: - Added VTKHOME as exported environmental variable. - - 08 May 2007; Markus Dittrich vtk-5.0.3.ebuild: - Re-added compile flag for javac needed on amd64 (see bug #177506). - - 06 May 2007; Markus Dittrich - +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 vtk-5.0.3.ebuild: - Check for qt3support useflag when building the examples under qt4 - (see bug #176847). - - 01 May 2007; Markus Dittrich 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 - -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=20 - Fabbro for his ebuild. - - 16 Apr 2007; Christian Faulhammer 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 +vtk-5.0.2.ebuild: - Version bump. - - 18 Nov 2006; Markus Dittrich 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 vtk-5.0.0.ebuild: - Added call to java-pkg_pkg_setup, for bug #142708 - - 23 Sep 2006; Markus Dittrich - +files/vtk-5.0.1-python2.5-gentoo.patch, vtk-5.0.1.ebuild: - Added patch to fix compile problems with python-2.5=20 - (see bug #148727). - - 08 Sep 2006; Markus Dittrich - +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 - 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 vtk-5.0.1.ebuild: - Moved to new java system. Removed -j1 from emake since it works=20 - fine here with -j2. - -*vtk-5.0.1 (09 Jul 2006) - - 09 Jul 2006; Markus Dittrich 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 vtk-5.0.0.ebuild: - Added a warning to the ebuild that qt4 is the default in case both=20 - qt3 and qt4 are selected as use flags (see bug #137658). - - 11 Jun 2006; Markus Dittrich vtk-5.0.0.ebuild: - Fix RDEPEND and cmake configuration such that tcl/tk is only=20 - pulled in and used if USE=3Dtcltk. This closes bug #136324. - - 27 Apr 2006; Alec Warner Manifest: - Fixing SHA256 digest, pass four - - 21 Apr 2006; Markus Dittrich 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 ChangeLog: - Removed from package.mask after testing. - - 27 Mar 2006; Markus Dittrich vtk-5.0.0.ebuild: - Added proper JAVA_AWT_LIBRARY cmake variable for amd64 platform. - Thanks to Sebastiaan for pointing this - out (c.f. bug #123178). - - 26 Mar 2006; Markus Dittrich - +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 for=20 - the fix. Also enabled compilation of vtk against either QT3 or QT4. - - 06 Mar 2006; Markus Dittrich vtk-5.0.0.ebuild: - Fixed some QT3 issues and forced -j1 during emake. Thanks - much to Sebastiaan for his fixes - and testing. - -*vtk-5.0.0 (05 Mar 2006) - - 05 Mar 2006; Markus Dittrich +vtk-5.0.0.ebuild: - Version bump. Many thanks to Toon Verstraelen=20 - and Sebastiaan=20 - for their ebuilds and patches. - This fixes bug #123178. - - 26 Feb 2006; Markus Dittrich vtk-4.2.6.ebuild: - Added cmake command line flag to prevent insecure RUNPATHS=20 - (c.f. bug #122875). - - 22 Jan 2006; Markus Dittrich vtk-4.2.6.ebuild: - Fix dependencies for modular X and replace instances of lib with - $(get_libdir). - - 17 Jan 2006; Markus Dittrich metadata.xml: - Changed maintainer to Markus Dittrich . - - 19 Dec 2005; Markus Dittrich vtk-4.2.6.ebuild: - Use python eclass functions to determine installed python version. - - 18 Dec 2005; Markus Dittrich vtk-4.2.6.ebuild: - Fixed compilation problems when using cmake-2.2.x and when compiling a= gainst - python 2.4.x. Also corrected installation path of vtk jar file. This f= ixes - bugs #112119, #103343, #113597. - - 08 Oct 2005; Thomas Matthijs vtk-4.2.6.ebuild: - use java-pkg_dojar not dojar - - 24 Aug 2005; Patrick Kursawe vtk-4.2.6.ebuild: - No longer using cp -a (bug #103487) - - 20 Aug 2005; Olivier Fisette vtk-4.2.6.ebuild: - Removed unused "data" USE flag (fixes bug #100418). - - 03 Jun 2005; Patrick Dawson vtk-4.2.6.ebuild: - Typo fix. - -*vtk-4.2.6 (10 May 2005) - - 10 May 2005; Patrick Dawson - +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/vt= k/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}) -=20 - 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/vt= k-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}) -=20 --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/i= nclude DOC "Path to file R.h") - FIND_LIBRARY(R_LIBRARY_BASE R PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DO= C "R library (example libR.a, libR.dylib, etc.).") --FIND_LIBRARY(R_LIBRARY_BLAS Rblas PATHS ${R_BASE_DIR} PATH_SUFFIXES /li= b 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 /li= b DOC "Rmath library (example libRmath.a, libRmath.dylib, etc.).") - FIND_LIBRARY(R_LIBRARY_READLINE readline DOC "(Optional) system readlin= e library. Only required if the R libraries were build with readline supp= ort.") -=20 --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) -=20 -+IF(VTK_USE_GNU_R) -+ FIND_PACKAGE(R) -+ENDIF(VTK_USE_GNU_R) -=20 -- -+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. -=20 -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 - #endif -=20 - #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/vtkTreeLayoutSt= rategy.cxx -index 4a764ea..74d0b53 100644 ---- a/Infovis/vtkTreeLayoutStrategy.cxx -+++ b/Infovis/vtkTreeLayoutStrategy.cxx -@@ -388,7 +388,7 @@ void vtkTreeLayoutStrategy::PrintSelf(ostream& os, v= tkIndent indent) - #include "vtkTreeToBoostAdapter.h" - #include - #include --#include -+#include - #include -=20 - using namespace boost; diff --git a/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch b/sci-libs/vtk/fi= les/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/f= iles/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 =3D=3D PNG_COLOR_TYPE_GRAY && bit_depth < 8)=20 - { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } -=20 - // add alpha if any alpha found -@@ -225,7 +225,7 @@ void vtkPNGReaderUpdate2(vtkPNGReader *self, OT *out= Ptr, - // minimum of a byte per pixel - if (color_type =3D=3D PNG_COLOR_TYPE_GRAY && bit_depth < 8)=20 - { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } -=20 - // 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 @@ - ) -=20 - FIND_LIBRARY( ODBC_LIBRARY=20 -- 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/fil= es/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 -+# include - #else - # include - #endif -diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFC= lose.cxx -index 0bf4314..1c10a93 100644 ---- a/CMake/vtkFFMPEGTestURLFClose.cxx -+++ b/CMake/vtkFFMPEGTestURLFClose.cxx -@@ -1,6 +1,6 @@ - extern "C" { - #ifdef HAS_OLD_HEADER --# include -+# include - #else - # include - #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 @@ -=20 - extern "C" { - #ifdef VTK_FFMPEG_HAS_OLD_HEADER --# include -+# include - #else - # include - #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 @@ - - - -sci -java - - markusle@gentoo.org - Markus Dittrich - - - jlec@gentoo.org - Justin Lecher - - - Add support for boost - Use nvidia's cg shaders - Build patented classes - Enable support for dev-lang/R - - diff --git a/sci-libs/vtk/vtk-5.6.1.ebuild b/sci-libs/vtk/vtk-5.6.1.ebuil= d 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=3D"3" - -PYTHON_DEPEND=3D"python? 2" - -inherit eutils flag-o-matic java-pkg-opt-2 python qt4-r2 versionator too= lchain-funcs cmake-utils - -# Short package version -SPV=3D"$(get_version_component_range 1-2)" - -DESCRIPTION=3D"The Visualization Toolkit" -HOMEPAGE=3D"http://www.vtk.org" -SRC_URI=3D"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=3D"BSD LGPL-2" -KEYWORDS=3D"~amd64 ~x86" -SLOT=3D"0" -IUSE=3D"boost cg doc examples ffmpeg java mpi mysql odbc patented postgr= es python qt4 tcl theora tk threads R" -RDEPEND=3D" - cg? ( media-gfx/nvidia-cg-toolkit ) - examples? ( - x11-libs/qt-core:4[qt3support] - x11-libs/qt-gui:4[qt3support] ) - ffmpeg? ( virtual/ffmpeg ) - java? ( >=3Dvirtual/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=3D"${RDEPEND} - java? ( >=3Dvirtual/jdk-1.5 ) - boost? ( >=3Ddev-libs/boost-1.40.0[mpi?] ) - dev-util/cmake" - -S=3D"${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=3D\"-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 i= n #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=3D( - -Wno-dev - -DVTK_INSTALL_PACKAGE_DIR=3D/$(get_libdir)/${PN}-${SPV} - -DCMAKE_SKIP_RPATH=3DYES - -DVTK_DIR=3D"${S}" - -DVTK_INSTALL_LIB_DIR=3D/$(get_libdir)/ - -DVTK_DATA_ROOT:PATH=3D"${EPREFIX}"/usr/share/${PN}/data - -DCMAKE_INSTALL_PREFIX=3D"${EPREFIX}"/usr - -DBUILD_SHARED_LIBS=3DON - -DVTK_USE_SYSTEM_EXPAT=3DON - -DVTK_USE_SYSTEM_FREETYPE=3DON - -DVTK_USE_SYSTEM_JPEG=3DON - -DVTK_USE_SYSTEM_LIBXML2=3DON - -DVTK_USE_SYSTEM_PNG=3DON - -DVTK_USE_SYSTEM_TIFF=3DON - -DVTK_USE_SYSTEM_ZLIB=3DON - -DBUILD_TESTING=3DOFF - -DBUILD_EXAMPLES=3DOFF - -DVTK_USE_HYBRID=3DON - -DVTK_USE_GL2PS=3DON - -DVTK_USE_RENDERING=3DON) - - # use flag triggered options - mycmakeargs+=3D( - $(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+=3D(-DVTK_USE_SYSTEM_OGGTHEORA=3DON) - - # mpi needs the parallel framework - if use mpi && use !threads; then - mycmakeargs+=3D(-DVTK_USE_PARALLEL=3DON) - fi - - if use java; then - mycmakeargs+=3D( - -DVTK_WRAP_JAVA=3DON - -DJAVA_AWT_INCLUDE_PATH=3D`java-config -O`/include - -DJAVA_INCLUDE_PATH:PATH=3D`java-config -O`/include - -DJAVA_INCLUDE_PATH2:PATH=3D`java-config -O`/include/linux) - - if [ "${ARCH}" =3D=3D "amd64" ]; then - mycmakeargs+=3D(-DJAVA_AWT_LIBRARY=3D`java-config -O`/jre/lib/${ARCH}= /libjawt.so) - else - mycmakeargs+=3D(-DJAVA_AWT_LIBRARY:PATH=3D`java-config -O`/jre/lib/i3= 86/libjawt.so) - fi - fi - - if use python; then - mycmakeargs+=3D( - -DVTK_WRAP_PYTHON=3DON - -DPYTHON_INCLUDE_PATH=3D$(python_get_includedir) - -DPYTHON_LIBRARY=3D$(python_get_library) - -DVTK_PYTHON_SETUP_ARGS:STRING=3D--root=3D"${D}") - fi - - if use qt4 ; then - mycmakeargs+=3D( - -DVTK_USE_GUISUPPORT=3DON - -DVTK_USE_QVTK=3DON - -DVTK_USE_QVTK_QTOPENGL=3DON - -DQT_WRAP_CPP=3DON - -DQT_WRAP_UI=3DON - -DVTK_INSTALL_QT_DIR=3D/$(get_libdir)/qt4/plugins/${PN} - -DDESIRED_QT_VERSION=3D4 - -DQT_MOC_EXECUTABLE=3D"${EPREFIX}"/usr/bin/moc - -DQT_UIC_EXECUTABLE=3D"${EPREFIX}"/usr/bin/uic - -DQT_INCLUDE_DIR=3D"${EPREFIX}"/usr/include/qt4 - -DQT_QMAKE_EXECUTABLE=3D"${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=3D${EPREFIX}/usr/share/${PN}/data - VTK_DIR=3D${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV} - VTKHOME=3D${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=3Dshow&file=3Dfaq0= 7.005.htp" - fi - - if use python; then - python_mod_optimize vtk - fi -} - -pkg_postrm() { - if use python; then - python_mod_cleanup vtk - fi -}