Don't use bundled libtheora, moved USE ogg -> theora

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 20 insertions, 10 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 320f5b93d8a5..6e1559c5b8d5 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -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.71 2010/05/29 10:13:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.72 2010/05/29 11:15:43 jlec Exp $
+
+*vtk-5.6.0-r2 (29 May 2010)
+
+  29 May 2010; Justin Lecher <jlec@gentoo.org> -vtk-5.6.0-r1.ebuild,
+  +vtk-5.6.0-r2.ebuild:
+  Don't use bundled libtheora, moved USE ogg -> theora
 
   29 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r1.ebuild:
   Added missing DEPS
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 90a1161a841d..967b972cdf9c 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -19,13 +19,13 @@ DIST vtkdata-5.4.2.tar.gz 52810062 RMD160 0cc24fc7a6a9bb80c619a0555eb288cc975540
 DIST vtkdata-5.6.0.tar.gz 76716069 RMD160 8499816f6d714408c0f7f584fb4d781f4426e444 SHA1 e0aa26dafd653da1db21fc97ce15aa0599d9c5ad SHA256 e6eed8e5c8d8410d7c7cf007de8c5b56bde77d38fa0522c1ac7751138323c9cf
 EBUILD vtk-5.4.2-r1.ebuild 6405 RMD160 e2e66c8f39da61dba40b176fb6f6bdd352d5350f SHA1 5523828af953afb4b1eae85873aa8f24a142e11d SHA256 14adbdd1417fb7572355c5f19859209163ac46db29d89fb5a646feb54fb7629b
 EBUILD vtk-5.4.2.ebuild 9254 RMD160 12f498536cd1b9f0879baf3adb61dd12ee4c74d2 SHA1 7f9a7021c2e28db613365bcdd1f57e4e7ff027c6 SHA256 4ee750ba1a9170c8541a6256d8cc3afc8e211088f712638e0e0dbf2e0aba2a7d
-EBUILD vtk-5.6.0-r1.ebuild 6737 RMD160 2eb83982a7d1ca119de9bc2c482e8499a41a64d4 SHA1 c47e366997189062e0cd7e74bef79e2f559c90e1 SHA256 98891e02551daf4d9e661ab70c7c539043d3c2a4e06aa29356687a82ed15d688
-MISC ChangeLog 11973 RMD160 71e919626553454791e055669843f080cafaa3b0 SHA1 592150de44294cf730166bb23072b4260509d00b SHA256 5f6f3e89c4b2df6728b4e2052d363ccebbe88d450d62e2ed19737bb8363c3b1b
+EBUILD vtk-5.6.0-r2.ebuild 6833 RMD160 682ee94c3a3a984422610202f8d4ec1ac54e2c02 SHA1 14446b081f578833d81098f8c4b7a416d4e2ab28 SHA256 ffe0c2029d656816e45b865a7c388f1a9485a78b8496c0125ce440a98b6a56c0
+MISC ChangeLog 12151 RMD160 e1c8c371aad811b9abb8babdf95fe41fa8733ee8 SHA1 1b59b6798d2219e3bb113e1087b8d1cdd6ecd799 SHA256 2b05eda277b48a256d57f863df1eaea5e21ca4c0f3126b6cd33d6b90e64bc0c2
 MISC metadata.xml 485 RMD160 f2b347cadff446a8d4e49715b0a855bb300d550e SHA1 98806a4e1cea8d9c95ed22f51ea8b2bcc931831e SHA256 b51fb6c14caf9400d08471ff6f445ba1ec4e748029c9d03bd3a2a6410122803c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwA6LwACgkQgAnW8HDreRbxsgCeIR4xD60rdp39ydHvIdBjVO8G
-BfIAoISMdOEU6safrS5QvclrIId0DoSI
-=uwWF
+iEYEARECAAYFAkwA92UACgkQgAnW8HDreRZ+OwCeI1E+V6jczhKiLiwULf3QXhIi
+QvAAnResdf1FVi7YvLHBF+oZaOwRoc9y
+=VUfe
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/vtk-5.6.0-r1.ebuild b/sci-libs/vtk/vtk-5.6.0-r2.ebuild
index 3a389ca9cca8..a13a36b6ff2f 100644
--- a/sci-libs/vtk/vtk-5.6.0-r1.ebuild
+++ b/sci-libs/vtk/vtk-5.6.0-r2.ebuild
@@ -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.6.0-r1.ebuild,v 1.3 2010/05/29 10:13:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0-r2.ebuild,v 1.1 2010/05/29 11:15:43 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -19,7 +19,7 @@ SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
 LICENSE="BSD LGPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="boost cg doc examples java mpi ogg patented python qt4 tcl tk threads R"
+IUSE="boost cg doc examples java mpi patented python qt4 tcl theora tk threads R"
 RDEPEND="
 	mpi? ( virtual/mpi[cxx,romio] )
 	cg? ( media-gfx/nvidia-cg-toolkit )
@@ -35,6 +35,7 @@ RDEPEND="
 	examples? (
 			x11-libs/qt-core:4[qt3support]
 			x11-libs/qt-gui:4[qt3support] )
+	theora? ( media-libs/libtheora )
 	R? ( dev-lang/R )
 	dev-libs/expat
 	dev-libs/libxml2
@@ -92,13 +93,13 @@ src_configure() {
 		-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_EXPAT=ON
-		-DVTK_USE_SYSTEM_LIBXML2=ON
 		-DBUILD_TESTING=OFF
 		-DBUILD_EXAMPLES=OFF
 		-DVTK_USE_HYBRID=ON
@@ -121,6 +122,9 @@ src_configure() {
 		$(cmake-utils_use threads VTK_USE_PARALLEL)
 		$(cmake-utils_use R VTK_USE_GNU_R) )
 
+	use ogg &&
+	mycmakeargs+=(-DVTK_USE_SYSTEM_OGGTHEORA=ON)
+
 	# mpi needs the parallel framework
 	if use mpi && use !threads; then
 		mycmakeargs+=(-DVTK_USE_PARALLEL=ON)