public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: ChangeLog vtk-5.8.0.ebuild
@ 2011-12-27 18:52 Justin Lecher (jlec)
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher (jlec) @ 2011-12-27 18:52 UTC (permalink / raw
  To: gentoo-commits

jlec        11/12/27 18:52:54

  Modified:             ChangeLog
  Added:                vtk-5.8.0.ebuild
  Log:
  Version Bump, #396119
  
  (Portage version: 2.2.0_alpha83/cvs/Linux x86_64)

Revision  Changes    Path
1.90                 sci-libs/vtk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.89&r2=1.90

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- ChangeLog	16 Nov 2011 09:50:18 -0000	1.89
+++ ChangeLog	27 Dec 2011 18:52:54 -0000	1.90
@@ -1,6 +1,12 @@
 # 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.89 2011/11/16 09:50:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.90 2011/12/27 18:52:54 jlec Exp $
+
+*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:



1.1                  sci-libs/vtk/vtk-5.8.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.1&content-type=text/plain

Index: vtk-5.8.0.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.1 2011/12/27 18:52:54 jlec Exp $

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
	doc? ( http://www.${PN}.org/doc/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"
SLOT="0"
IUSE="boost cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 tk theora tk threads video_cards_nvidia R X"

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 )
	tk? ( dev-lang/tk )
	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}"/${P}-R.patch \
		"${FILESDIR}"/${PN}-5.6.0-odbc.patch \
		"${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch \
		"${FILESDIR}"/${PN}-5.6.1-libav-0.8.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"
}

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
		-DVTK_USE_SYSTEM_HDF5=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 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 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 R VTK_USE_GNU_R)
	)

	use tk &&
	mycmakeargs+=(
		VTK_WRAP_TCL
		VTK_WRAP_TK
		VTK_TCL_INCLUDE_DIR="${EPREFIX}"/usr/include
		VTK_TCL_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
		VTK_TK_INCLUDE_DIR="${EPREFIX}"/usr/include
		VTK_TK_LIBRARY="${EPREFIX}"/usr/$(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+=(
			-DVTK_WRAP_PYTHON=ON
			-DVTK_WRAP_PYTHON_SIP=ON
			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
			-DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
			-DVTK_PYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir)
			-DVTK_PYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
			-DPYTHON_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
}

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 "${WORKDIR}"/{VTKData,data} || die
		doins -r "${WORKDIR}"/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	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: ChangeLog vtk-5.8.0.ebuild
@ 2011-12-29 11:39 Justin Lecher (jlec)
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher (jlec) @ 2011-12-29 11:39 UTC (permalink / raw
  To: gentoo-commits

jlec        11/12/29 11:39:17

  Modified:             ChangeLog vtk-5.8.0.ebuild
  Log:
  Add missing deps for hdf5 and PyQt4/sip support
  
  (Portage version: 2.2.0_alpha83/cvs/Linux x86_64)

Revision  Changes    Path
1.91                 sci-libs/vtk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.90&r2=1.91

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- ChangeLog	27 Dec 2011 18:52:54 -0000	1.90
+++ ChangeLog	29 Dec 2011 11:39:17 -0000	1.91
@@ -1,6 +1,9 @@
 # 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.90 2011/12/27 18:52:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.91 2011/12/29 11:39:17 jlec Exp $
+
+  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)
 



1.2                  sci-libs/vtk/vtk-5.8.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?r1=1.1&r2=1.2

Index: vtk-5.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vtk-5.8.0.ebuild	27 Dec 2011 18:52:54 -0000	1.1
+++ vtk-5.8.0.ebuild	29 Dec 2011 11:39:17 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.1 2011/12/27 18:52:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.2 2011/12/29 11:39:17 jlec Exp $
 
 EAPI=3
 
@@ -24,38 +24,42 @@
 IUSE="boost cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 tk theora tk threads video_cards_nvidia R X"
 
 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/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
 	cg? ( media-gfx/nvidia-cg-toolkit )
 	examples? (
-			x11-libs/qt-core:4[qt3support]
-			x11-libs/qt-gui:4[qt3support] )
+		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 )
+	python? ( dev-python/sip )
 	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 )
+		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
+		python? ( dev-python/PyQt4	)
+		)
 	tk? ( dev-lang/tk )
 	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"
+	R? ( dev-lang/R )"
 DEPEND="${RDEPEND}
 		java? ( >=virtual/jdk-1.5 )
 		boost? ( >=dev-libs/boost-1.40.0[mpi?] )
@@ -63,6 +67,15 @@
 
 S="${WORKDIR}"/VTK
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.6.0-cg-path.patch
+	"${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
+	"${FILESDIR}"/${P}-R.patch
+	"${FILESDIR}"/${PN}-5.6.0-odbc.patch
+	"${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch
+	"${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch
+	)
+
 pkg_setup() {
 	echo
 	einfo "Please note that the VTK build occasionally fails when"
@@ -76,21 +89,6 @@
 	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}"/${P}-R.patch \
-		"${FILESDIR}"/${PN}-5.6.0-odbc.patch \
-		"${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch \
-		"${FILESDIR}"/${PN}-5.6.1-libav-0.8.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"
-}
-
 src_configure() {
 	# general configuration
 	local mycmakeargs=(
@@ -142,12 +140,12 @@
 
 	use tk &&
 	mycmakeargs+=(
-		VTK_WRAP_TCL
-		VTK_WRAP_TK
-		VTK_TCL_INCLUDE_DIR="${EPREFIX}"/usr/include
-		VTK_TCL_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
-		VTK_TK_INCLUDE_DIR="${EPREFIX}"/usr/include
-		VTK_TK_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
+		-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)
 	)
 
 	use theora &&






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: ChangeLog vtk-5.8.0.ebuild
@ 2011-12-29 13:28 Justin Lecher (jlec)
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher (jlec) @ 2011-12-29 13:28 UTC (permalink / raw
  To: gentoo-commits

jlec        11/12/29 13:28:51

  Modified:             ChangeLog vtk-5.8.0.ebuild
  Log:
  Correct PYTHON_SETUP_ARGS to VTK_PYTHON_SETUP_ARGS, #396297
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.92                 sci-libs/vtk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.91&r2=1.92

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog	29 Dec 2011 11:39:17 -0000	1.91
+++ ChangeLog	29 Dec 2011 13:28:51 -0000	1.92
@@ -1,6 +1,9 @@
 # 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.91 2011/12/29 11:39:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.92 2011/12/29 13:28:51 jlec Exp $
+
+  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



1.3                  sci-libs/vtk/vtk-5.8.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?r1=1.2&r2=1.3

Index: vtk-5.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vtk-5.8.0.ebuild	29 Dec 2011 11:39:17 -0000	1.2
+++ vtk-5.8.0.ebuild	29 Dec 2011 13:28:51 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.2 2011/12/29 11:39:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.3 2011/12/29 13:28:51 jlec Exp $
 
 EAPI=3
 
@@ -135,6 +135,7 @@
 		$(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)
 	)
 
@@ -179,7 +180,7 @@
 			-DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
 			-DVTK_PYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir)
 			-DVTK_PYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
-			-DPYTHON_SETUP_ARGS:STRING=--root="${D}")
+			-DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}")
 	fi
 
 	if use qt4 ; then






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: ChangeLog vtk-5.8.0.ebuild
@ 2012-02-10 19:36 Justin Lecher (jlec)
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher (jlec) @ 2012-02-10 19:36 UTC (permalink / raw
  To: gentoo-commits

jlec        12/02/10 19:36:06

  Modified:             ChangeLog vtk-5.8.0.ebuild
  Log:
  Backport patch for boost-4.48, #400901
  
  (Portage version: 2.2.0_alpha85/cvs/Linux x86_64)

Revision  Changes    Path
1.94                 sci-libs/vtk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.93&r2=1.94

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ChangeLog	10 Feb 2012 18:55:37 -0000	1.93
+++ ChangeLog	10 Feb 2012 19:36:06 -0000	1.94
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.93 2012/02/10 18:55:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.94 2012/02/10 19:36:06 jlec Exp $
+
+  10 Feb 2012; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild,
+  +files/vtk-5.8.0-boost.patch:
+  Backport patch for boost-4.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,



1.5                  sci-libs/vtk/vtk-5.8.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?r1=1.4&r2=1.5

Index: vtk-5.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vtk-5.8.0.ebuild	10 Feb 2012 18:55:37 -0000	1.4
+++ vtk-5.8.0.ebuild	10 Feb 2012 19:36:06 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.4 2012/02/10 18:55:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.5 2012/02/10 19:36:06 jlec Exp $
 
 EAPI=3
 
@@ -74,6 +74,7 @@
 	"${FILESDIR}"/${PN}-5.6.0-odbc.patch
 	"${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch
 	"${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch
+	"${FILESDIR}"/${P}-boost.patch
 	)
 
 pkg_setup() {
@@ -97,8 +98,8 @@
 		-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
+		-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
@@ -108,8 +109,8 @@
 		-DVTK_USE_SYSTEM_TIFF=ON
 		-DVTK_USE_SYSTEM_ZLIB=ON
 		-DVTK_USE_SYSTEM_HDF5=ON
-		-DHDF5_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
-		-DHDF5_INCLUDE_DIRS="${EPREFIX}"/usr/include
+		-DHDF5_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
+		-DHDF5_INCLUDE_DIRS="${EPREFIX}/usr/include"
 		-DBUILD_TESTING=OFF
 		-DBUILD_EXAMPLES=OFF
 		-DVTK_USE_HYBRID=ON
@@ -143,10 +144,10 @@
 	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_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)"
 	)
 
 	use theora &&
@@ -178,9 +179,9 @@
 			-DVTK_WRAP_PYTHON_SIP=ON
 			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
 			-DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
-			-DPYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir)
+			-DPYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
 			-DPYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
-			-DVTK_PYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir)
+			-DVTK_PYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
 			-DVTK_PYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
 			-DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}")
 	fi
@@ -195,10 +196,10 @@
 			-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)
+			-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






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: ChangeLog vtk-5.8.0.ebuild
@ 2012-02-27 22:58 Justin Lecher (jlec)
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher (jlec) @ 2012-02-27 22:58 UTC (permalink / raw
  To: gentoo-commits

jlec        12/02/27 22:58:07

  Modified:             ChangeLog vtk-5.8.0.ebuild
  Log:
  Fix typo in Changelog and commit fix for #401839
  
  (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

Revision  Changes    Path
1.96                 sci-libs/vtk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.95&r2=1.96

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ChangeLog	13 Feb 2012 14:12:34 -0000	1.95
+++ ChangeLog	27 Feb 2012 22:58:06 -0000	1.96
@@ -1,13 +1,16 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.95 2012/02/13 14:12:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.96 2012/02/27 22:58:06 jlec Exp $
+
+  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-4.48, #400901
+  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,



1.7                  sci-libs/vtk/vtk-5.8.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?r1=1.6&r2=1.7

Index: vtk-5.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vtk-5.8.0.ebuild	13 Feb 2012 14:12:34 -0000	1.6
+++ vtk-5.8.0.ebuild	27 Feb 2012 22:58:06 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.6 2012/02/13 14:12:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.7 2012/02/27 22:58:06 jlec Exp $
 
 EAPI=3
 
@@ -176,6 +176,8 @@
 
 	if use python; then
 		mycmakeargs+=(
+			-DPYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir)
+			-DPYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
 			-DVTK_WRAP_PYTHON=ON
 			-DVTK_WRAP_PYTHON_SIP=ON
 			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: ChangeLog vtk-5.8.0.ebuild
@ 2012-03-20 14:51 Jeroen Roovers (jer)
  0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers (jer) @ 2012-03-20 14:51 UTC (permalink / raw
  To: gentoo-commits

jer         12/03/20 14:51:41

  Modified:             ChangeLog vtk-5.8.0.ebuild
  Log:
  Sort IUSE entries. Remove IUSE=tk duplicate by zvasylvv (bug #408871).
  
  (Portage version: 2.2.0_alpha93/cvs/Linux x86_64)

Revision  Changes    Path
1.97                 sci-libs/vtk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.96&r2=1.97

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ChangeLog	27 Feb 2012 22:58:06 -0000	1.96
+++ ChangeLog	20 Mar 2012 14:51:41 -0000	1.97
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.96 2012/02/27 22:58:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.97 2012/03/20 14:51:41 jer Exp $
+
+  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



1.8                  sci-libs/vtk/vtk-5.8.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?r1=1.7&r2=1.8

Index: vtk-5.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vtk-5.8.0.ebuild	27 Feb 2012 22:58:06 -0000	1.7
+++ vtk-5.8.0.ebuild	20 Mar 2012 14:51:41 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.7 2012/02/27 22:58:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.8 2012/03/20 14:51:41 jer Exp $
 
 EAPI=3
 
@@ -21,7 +21,7 @@
 LICENSE="BSD LGPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="boost cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 tk theora tk threads video_cards_nvidia R X"
+IUSE="boost cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 R theora threads tk video_cards_nvidia X"
 
 RDEPEND="
 	dev-libs/expat






^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2012-03-20 14:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-20 14:51 [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: ChangeLog vtk-5.8.0.ebuild Jeroen Roovers (jer)
  -- strict thread matches above, loose matches on Subject: below --
2012-02-27 22:58 Justin Lecher (jlec)
2012-02-10 19:36 Justin Lecher (jlec)
2011-12-29 13:28 Justin Lecher (jlec)
2011-12-29 11:39 Justin Lecher (jlec)
2011-12-27 18:52 Justin Lecher (jlec)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox