* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-5.4.2-r1.ebuild ChangeLog
@ 2009-12-19 16:41 Markus Dittrich (markusle)
0 siblings, 0 replies; 7+ messages in thread
From: Markus Dittrich (markusle) @ 2009-12-19 16:41 UTC (permalink / raw
To: gentoo-commits
markusle 09/12/19 16:41:32
Modified: ChangeLog
Added: vtk-5.4.2-r1.ebuild
Log:
New revision uses cmake-utils eclass and is significantly cleaned up. This should have also fixed bugs #295053 and #287591.
(Portage version: 2.1.7.14/cvs/Linux x86_64)
Revision Changes Path
1.59 sci-libs/vtk/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.58&r2=1.59
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ChangeLog 17 Dec 2009 23:43:31 -0000 1.58
+++ ChangeLog 19 Dec 2009 16:41:31 -0000 1.59
@@ -1,6 +1,13 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.58 2009/12/17 23:43:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.59 2009/12/19 16:41:31 markusle Exp $
+
+*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).
1.1 sci-libs/vtk/vtk-5.4.2-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: vtk-5.4.2-r1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.1 2009/12/19 16:41:31 markusle Exp $
EAPI="2"
inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4 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 mpi patented python tcl tk threads qt3 qt4"
RDEPEND="mpi? ( || (
sys-cluster/openmpi
sys-cluster/lam-mpi
sys-cluster/mpich2[cxx] ) )
python? ( >=dev-lang/python-2.0 )
cg? ( media-gfx/nvidia-cg-toolkit )
tcl? ( >=dev-lang/tcl-8.2.3 )
tk? ( >=dev-lang/tk-8.2.3 )
java? ( >=virtual/jre-1.5 )
!qt4? ( qt3? ( >=x11-libs/qt-3.3.4:3 ) )
qt4? ( x11-libs/qt-core:4
x11-libs/qt-opengl:4
x11-libs/qt-gui:4 )
examples? ( x11-libs/qt-core:4[qt3support]
x11-libs/qt-gui:4[qt3support] )
dev-libs/expat
dev-libs/libxml2
media-libs/freetype
media-libs/jpeg
media-libs/libpng
media-libs/tiff
virtual/opengl
x11-libs/libXmu"
DEPEND="${RDEPEND}
java? ( >=virtual/jdk-1.5 )
boost? ( dev-libs/boost )
>=dev-util/cmake-2.6"
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
epause 5
java-pkg-opt-2_pkg_setup
if use qt3 && use qt4; then
echo
ewarn "qt3 and qt4 support for vtk are mutually exclusive and"
ewarn "qt4 support has therefore been enabled by default."
echo
fi
if use qt4; then
qt4_pkg_setup
fi
}
src_prepare() {
epatch "${FILESDIR}"/${P}-cg-path.patch
epatch "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
-i Wrapping/Tcl/pkgIndex.tcl.in \
|| die "Failed to fix tcl pkgIndex file"
}
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=/usr/share/${PN}/data
-DCMAKE_INSTALL_PREFIX=/usr
-DBUILD_SHARED_LIBS=ON
-DVTK_USE_SYSTEM_FREETYPE=ON
-DVTK_USE_SYSTEM_JPEG=ON
-DVTK_USE_SYSTEM_PNG=ON
-DVTK_USE_SYSTEM_TIFF=ON
-DVTK_USE_SYSTEM_ZLIB=ON
-DVTK_USE_SYSTEM_EXPAT=ON
-DVTK_USE_SYSTEM_LIBXML2=ON
-DBUILD_TESTING=OFF
-DBUILD_EXAMPLES=OFF
-DVTK_USE_HYBRID=ON
-DVTK_USE_GL2PS=ON
-DVTK_USE_RENDERING=ON"
# use flag triggered options
mycmakeargs="${mycmakeargs}
$(cmake-utils_use boost VTK_USE_BOOST)
$(cmake-utils_use cg VTK_USE_CG_SHADERS)
$(cmake-utils_use tcl VTK_WRAP_TCL)
$(cmake-utils_use tk VTK_USE_TK)
$(cmake-utils_use threads VTK_USE_PARALLEL)
$(cmake-utils_use patented VTK_USE_PATENTED)
$(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
$(cmake-utils_use_build doc DOCUMENTATION)
$(cmake-utils_use mpi VTK_USE_MPI)"
# mpi needs the parallel framework
if use mpi && use !threads; then
mycmakeargs="${mycmakeargs}
-DVTK_USE_PARALLEL=ON"
fi
if use java; then
mycmakeargs="${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="${mycmakeargs}
-DJAVA_AWT_LIBRARY=`java-config -O`/jre/lib/${ARCH}/libjawt.so"
else
mycmakeargs="${mycmakeargs}
-DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so"
fi
fi
if use python; then
python_version
mycmakeargs="${mycmakeargs}
-DVTK_WRAP_PYTHON=ON
-DPYTHON_INCLUDE_PATH=/usr/include/python${PYVER}
-DPYTHON_LIBRARY=/usr/$(get_libdir)/libpython${PYVER}.so
-DVTK_PYTHON_SETUP_ARGS:STRING=--root=${D}"
fi
if use qt3 || use qt4 ; then
mycmakeargs="${mycmakeargs}
-DVTK_USE_GUISUPPORT=ON
-DVTK_USE_QVTK=ON
-DVTK_USE_QVTK_QTOPENGL=ON
-DQT_WRAP_CPP=ON
-DQT_WRAP_UI=ON"
fi
# these options we only enable if the use request qt3
# only. In case of qt3 && qt4 or qt4 only qt4 always
# overrides qt3
if use qt3 && use !qt4; then
mycmakeargs="${mycmakeargs}
-DVTK_INSTALL_QT_DIR=/qt/3/plugins/${PN}
-DDESIRED_QT_VERSION=3
-DQT_MOC_EXECUTABLE=/usr/qt/3/bin/moc
-DQT_UIC_EXECUTABLE=/usr/qt/3/bin/uic
-DQT_INCLUDE_DIR=/usr/qt/3/include
-DQT_QT_LIBRARY=/usr/qt/3/$(get_libdir)/libqt.so
-DQT_QMAKE_EXECUTABLE=/usr/qt/3/bin/qmake"
fi
if use qt4; then
mycmakeargs="${mycmakeargs}
-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN}
-DDESIRED_QT_VERSION=4
-DQT_MOC_EXECUTABLE=/usr/bin/moc
-DQT_UIC_EXECUTABLE=/usr/bin/uic
-DQT_INCLUDE_DIR=/usr/include/qt4
-DQT_QMAKE_EXECUTABLE=/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
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"
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
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}
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 [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-5.4.2-r1.ebuild ChangeLog
@ 2010-01-16 20:16 Markus Dittrich (markusle)
0 siblings, 0 replies; 7+ messages in thread
From: Markus Dittrich (markusle) @ 2010-01-16 20:16 UTC (permalink / raw
To: gentoo-commits
markusle 10/01/16 20:16:30
Modified: vtk-5.4.2-r1.ebuild ChangeLog
Log:
Updated handling of mycmakeargs from cmake-utils.eclass.
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Revision Changes Path
1.2 sci-libs/vtk/vtk-5.4.2-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?r1=1.1&r2=1.2
Index: vtk-5.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vtk-5.4.2-r1.ebuild 19 Dec 2009 16:41:31 -0000 1.1
+++ vtk-5.4.2-r1.ebuild 16 Jan 2010 20:16:29 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.1 2009/12/19 16:41:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.2 2010/01/16 20:16:29 markusle Exp $
EAPI="2"
inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4 cmake-utils
@@ -80,11 +80,11 @@
src_configure() {
# general configuration
- local mycmakeargs="
+ local mycmakeargs=(
-Wno-dev
-DVTK_INSTALL_PACKAGE_DIR=/$(get_libdir)/${PN}-${SPV}
-DCMAKE_SKIP_RPATH=YES
- -DVTK_DIR=${S}
+ -DVTK_DIR="${S}"
-DVTK_INSTALL_LIB_DIR=/$(get_libdir)/
-DVTK_DATA_ROOT:PATH=/usr/share/${PN}/data
-DCMAKE_INSTALL_PREFIX=/usr
@@ -100,10 +100,10 @@
-DBUILD_EXAMPLES=OFF
-DVTK_USE_HYBRID=ON
-DVTK_USE_GL2PS=ON
- -DVTK_USE_RENDERING=ON"
+ -DVTK_USE_RENDERING=ON)
# use flag triggered options
- mycmakeargs="${mycmakeargs}
+ mycmakeargs+=(
$(cmake-utils_use boost VTK_USE_BOOST)
$(cmake-utils_use cg VTK_USE_CG_SHADERS)
$(cmake-utils_use tcl VTK_WRAP_TCL)
@@ -112,70 +112,67 @@
$(cmake-utils_use patented VTK_USE_PATENTED)
$(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
$(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use mpi VTK_USE_MPI)"
+ $(cmake-utils_use mpi VTK_USE_MPI))
# mpi needs the parallel framework
if use mpi && use !threads; then
- mycmakeargs="${mycmakeargs}
- -DVTK_USE_PARALLEL=ON"
+ mycmakeargs+=(-DVTK_USE_PARALLEL=ON)
fi
if use java; then
- mycmakeargs="${mycmakeargs}
+ 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"
+ -DJAVA_INCLUDE_PATH2:PATH=`java-config -O`/include/linux)
if [ "${ARCH}" == "amd64" ]; then
- mycmakeargs="${mycmakeargs}
- -DJAVA_AWT_LIBRARY=`java-config -O`/jre/lib/${ARCH}/libjawt.so"
+ mycmakeargs+=(-DJAVA_AWT_LIBRARY=`java-config -O`/jre/lib/${ARCH}/libjawt.so)
else
- mycmakeargs="${mycmakeargs}
- -DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so"
+ mycmakeargs+=(-DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so)
fi
fi
if use python; then
python_version
- mycmakeargs="${mycmakeargs}
+ mycmakeargs+=(
-DVTK_WRAP_PYTHON=ON
-DPYTHON_INCLUDE_PATH=/usr/include/python${PYVER}
-DPYTHON_LIBRARY=/usr/$(get_libdir)/libpython${PYVER}.so
- -DVTK_PYTHON_SETUP_ARGS:STRING=--root=${D}"
+ -DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}")
fi
if use qt3 || use qt4 ; then
- mycmakeargs="${mycmakeargs}
+ mycmakeargs+=(
-DVTK_USE_GUISUPPORT=ON
-DVTK_USE_QVTK=ON
-DVTK_USE_QVTK_QTOPENGL=ON
-DQT_WRAP_CPP=ON
- -DQT_WRAP_UI=ON"
+ -DQT_WRAP_UI=ON)
fi
# these options we only enable if the use request qt3
# only. In case of qt3 && qt4 or qt4 only qt4 always
# overrides qt3
if use qt3 && use !qt4; then
- mycmakeargs="${mycmakeargs}
+ mycmakeargs+=(
-DVTK_INSTALL_QT_DIR=/qt/3/plugins/${PN}
-DDESIRED_QT_VERSION=3
-DQT_MOC_EXECUTABLE=/usr/qt/3/bin/moc
-DQT_UIC_EXECUTABLE=/usr/qt/3/bin/uic
-DQT_INCLUDE_DIR=/usr/qt/3/include
-DQT_QT_LIBRARY=/usr/qt/3/$(get_libdir)/libqt.so
- -DQT_QMAKE_EXECUTABLE=/usr/qt/3/bin/qmake"
+ -DQT_QMAKE_EXECUTABLE=/usr/qt/3/bin/qmake)
fi
if use qt4; then
- mycmakeargs="${mycmakeargs}
+ mycmakeargs+=(
-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN}
-DDESIRED_QT_VERSION=4
-DQT_MOC_EXECUTABLE=/usr/bin/moc
-DQT_UIC_EXECUTABLE=/usr/bin/uic
-DQT_INCLUDE_DIR=/usr/include/qt4
- -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake"
+ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake)
fi
cmake-utils_src_configure
1.60 sci-libs/vtk/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.59&r2=1.60
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog 19 Dec 2009 16:41:31 -0000 1.59
+++ ChangeLog 16 Jan 2010 20:16:29 -0000 1.60
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/vtk
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.59 2009/12/19 16:41:31 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.60 2010/01/16 20:16:29 markusle Exp $
+
+ 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)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-5.4.2-r1.ebuild ChangeLog
@ 2010-01-21 23:38 Markus Dittrich (markusle)
0 siblings, 0 replies; 7+ messages in thread
From: Markus Dittrich (markusle) @ 2010-01-21 23:38 UTC (permalink / raw
To: gentoo-commits
markusle 10/01/21 23:38:26
Modified: vtk-5.4.2-r1.ebuild ChangeLog
Log:
Added patch to allow compilation against boost-1.42 (fixes #301684).
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Revision Changes Path
1.3 sci-libs/vtk/vtk-5.4.2-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?r1=1.2&r2=1.3
Index: vtk-5.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vtk-5.4.2-r1.ebuild 16 Jan 2010 20:16:29 -0000 1.2
+++ vtk-5.4.2-r1.ebuild 21 Jan 2010 23:38:26 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.2 2010/01/16 20:16:29 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.3 2010/01/21 23:38:26 markusle Exp $
EAPI="2"
inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4 cmake-utils
@@ -44,7 +44,7 @@
DEPEND="${RDEPEND}
java? ( >=virtual/jdk-1.5 )
- boost? ( dev-libs/boost )
+ boost? ( >=dev-libs/boost-1.40.0 )
>=dev-util/cmake-2.6"
S="${WORKDIR}"/VTK
@@ -73,6 +73,7 @@
src_prepare() {
epatch "${FILESDIR}"/${P}-cg-path.patch
epatch "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
+ epatch "${FILESDIR}"/${P}-boost-property_map.patch
sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
-i Wrapping/Tcl/pkgIndex.tcl.in \
|| die "Failed to fix tcl pkgIndex file"
1.61 sci-libs/vtk/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.60&r2=1.61
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog 16 Jan 2010 20:16:29 -0000 1.60
+++ ChangeLog 21 Jan 2010 23:38:26 -0000 1.61
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.60 2010/01/16 20:16:29 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.61 2010/01/21 23:38:26 markusle Exp $
+
+ 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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-5.4.2-r1.ebuild ChangeLog
@ 2010-03-11 20:31 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 7+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-03-11 20:31 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/03/11 20:31:04
Modified: vtk-5.4.2-r1.ebuild ChangeLog
Log:
Fix building with libpng14.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.5 sci-libs/vtk/vtk-5.4.2-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?r1=1.4&r2=1.5
Index: vtk-5.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vtk-5.4.2-r1.ebuild 11 Feb 2010 07:38:19 -0000 1.4
+++ vtk-5.4.2-r1.ebuild 11 Mar 2010 20:31:03 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.4 2010/02/11 07:38:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.5 2010/03/11 20:31:03 ssuominen Exp $
EAPI="2"
inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4 cmake-utils
@@ -67,6 +67,7 @@
epatch "${FILESDIR}"/${P}-cg-path.patch
epatch "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
epatch "${FILESDIR}"/${P}-boost-property_map.patch
+ epatch "${FILESDIR}"/${P}-libpng14.patch
sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
-i Wrapping/Tcl/pkgIndex.tcl.in \
|| die "Failed to fix tcl pkgIndex file"
1.63 sci-libs/vtk/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.62&r2=1.63
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog 11 Feb 2010 07:38:19 -0000 1.62
+++ ChangeLog 11 Mar 2010 20:31:03 -0000 1.63
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.62 2010/02/11 07:38:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.63 2010/03/11 20:31:03 ssuominen Exp $
+
+ 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) <jlec@j-schmitz.net> vtk-5.4.2.ebuild,
vtk-5.4.2-r1.ebuild:
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-5.4.2-r1.ebuild ChangeLog
@ 2010-04-25 10:00 Justin Lecher (jlec)
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher (jlec) @ 2010-04-25 10:00 UTC (permalink / raw
To: gentoo-commits
jlec 10/04/25 10:00:50
Modified: vtk-5.4.2-r1.ebuild ChangeLog
Log:
Python ABI fixes, #316229
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.7 sci-libs/vtk/vtk-5.4.2-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?r1=1.6&r2=1.7
Index: vtk-5.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vtk-5.4.2-r1.ebuild 26 Mar 2010 12:40:16 -0000 1.6
+++ vtk-5.4.2-r1.ebuild 25 Apr 2010 10:00:50 -0000 1.7
@@ -1,9 +1,11 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.6 2010/03/26 12:40:16 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.7 2010/04/25 10:00:50 jlec Exp $
EAPI="2"
-inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt4 cmake-utils
+
+PYTHON_DEPEND="python? 2"
+inherit cmake-utils eutils flag-o-matic java-pkg-opt-2 python qt4 versionator toolchain-funcs
# Short package version
SPV="$(get_version_component_range 1-2)"
@@ -17,7 +19,7 @@
LICENSE="BSD LGPL-2"
KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="boost cg doc examples mpi patented python tcl tk threads qt4"
+IUSE="boost cg doc examples mpi patented python qt4 tcl tk threads"
RDEPEND="mpi? ( || (
sys-cluster/openmpi
sys-cluster/lam-mpi
@@ -58,9 +60,8 @@
java-pkg-opt-2_pkg_setup
- if use qt4; then
- qt4_pkg_setup
- fi
+ use python && python_set_active_version 2
+ use qt4 && qt4_pkg_setup
}
src_prepare() {
@@ -129,7 +130,7 @@
fi
if use python; then
- python_version
+ PYVER="$(python_get_version)"
mycmakeargs+=(
-DVTK_WRAP_PYTHON=ON
-DPYTHON_INCLUDE_PATH=/usr/include/python${PYVER}
1.65 sci-libs/vtk/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.64&r2=1.65
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ChangeLog 26 Mar 2010 12:40:16 -0000 1.64
+++ ChangeLog 25 Apr 2010 10:00:50 -0000 1.65
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.64 2010/03/26 12:40:16 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.65 2010/04/25 10:00:50 jlec Exp $
+
+ 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:
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-5.4.2-r1.ebuild ChangeLog
@ 2010-06-17 2:25 Justin Bronder (jsbronder)
0 siblings, 0 replies; 7+ messages in thread
From: Justin Bronder (jsbronder) @ 2010-06-17 2:25 UTC (permalink / raw
To: gentoo-commits
jsbronder 10/06/17 02:25:18
Modified: vtk-5.4.2-r1.ebuild ChangeLog
Log:
Remove sys-cluster/lam-mpi handling from sci-libs/vtk, see #324415.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.12 sci-libs/vtk/vtk-5.4.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?r1=1.11&r2=1.12
Index: vtk-5.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vtk-5.4.2-r1.ebuild 28 May 2010 11:51:24 -0000 1.11
+++ vtk-5.4.2-r1.ebuild 17 Jun 2010 02:25:18 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.11 2010/05/28 11:51:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.12 2010/06/17 02:25:18 jsbronder Exp $
EAPI="3"
PYTHON_DEPEND="python? 2"
@@ -22,7 +22,6 @@
IUSE="boost cg doc examples mpi patented python qt4 tcl tk threads"
RDEPEND="mpi? ( || (
sys-cluster/openmpi
- sys-cluster/lam-mpi
sys-cluster/mpich2[cxx] ) )
cg? ( media-gfx/nvidia-cg-toolkit )
tcl? ( >=dev-lang/tcl-8.2.3 )
1.76 sci-libs/vtk/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.75&r2=1.76
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog 9 Jun 2010 07:06:16 -0000 1.75
+++ ChangeLog 17 Jun 2010 02:25:18 -0000 1.76
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.75 2010/06/09 07:06:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.76 2010/06/17 02:25:18 jsbronder Exp $
+
+ 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-5.4.2-r1.ebuild ChangeLog
@ 2010-11-09 7:57 Kacper Kowalik (xarthisius)
0 siblings, 0 replies; 7+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2010-11-09 7:57 UTC (permalink / raw
To: gentoo-commits
xarthisius 10/11/09 07:57:14
Modified: ChangeLog
Added: vtk-5.4.2-r1.ebuild
Log:
Bring back vtk-5.4.x as sci-visualization/mayavi:1 depends on it. media-libs/jpeg -> virtual/jpeg
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Revision Changes Path
1.80 sci-libs/vtk/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.79&r2=1.80
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog 8 Nov 2010 17:48:45 -0000 1.79
+++ ChangeLog 9 Nov 2010 07:57:14 -0000 1.80
@@ -1,6 +1,12 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.79 2010/11/08 17:48:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.80 2010/11/09 07:57:14 xarthisius Exp $
+
+ 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,
1.14 sci-libs/vtk/vtk-5.4.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?r1=1.13&r2=1.14
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-11-09 7:57 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-17 2:25 [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-5.4.2-r1.ebuild ChangeLog Justin Bronder (jsbronder)
-- strict thread matches above, loose matches on Subject: below --
2010-11-09 7:57 Kacper Kowalik (xarthisius)
2010-04-25 10:00 Justin Lecher (jlec)
2010-03-11 20:31 Samuli Suominen (ssuominen)
2010-01-21 23:38 Markus Dittrich (markusle)
2010-01-16 20:16 Markus Dittrich (markusle)
2009-12-19 16:41 Markus Dittrich (markusle)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox