Fixed ogg -> theora USE transition

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

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index de970a77ed17319789289fbef692cbc8d6d77d8f..36fc945315ec9dce2f07a4cbd06ced84e640c3e5 100644 (file)
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -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.73 2010/05/31 07:08:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.74 2010/06/07 17:45:09 jlec Exp $
+
+  07 Jun 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild:
+  Fixed ogg -> theora USE transition
 
   31 May 2010; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Added myself as maintainer

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index df5b60516296328508c77413cdc9dc6470c4d11b..0f53511bb197db4b842a6a8d68068bf7e85a4485 100644 (file)
--- 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-r2.ebuild 6839 RMD160 87c1a6be7b192061383a6e686d54eec84b29b90e SHA1 0912e5ae98a01f07edf93245869318099654b774 SHA256 fc797a27c28649b381fa16afc4eea291927cfa2e9a1eea37f04efc01e97a34ff
-MISC ChangeLog 12242 RMD160 362ee03fa6d0b5f9bc8714a0e09586f676718e4d SHA1 e173554b8e9043cd3a5d609820f4197f304a6fb3 SHA256 43846a39ad0cb84c57a0735ca9d90e9f15df447c45f985c69b5110f95ee16b74
+EBUILD vtk-5.6.0-r2.ebuild 6845 RMD160 baff7613cfc9ae8edc1ec058c539eb9be2c4f288 SHA1 113fc220e15c24bcb5bdbb52b77cb2b7b655a489 SHA256 2006433a443134e3a3ca34520f2a5e56973bb8e42567c1edd1cfe3f1f6369b1f
+MISC ChangeLog 12348 RMD160 4c63f31daca56429d5dc5fbcf164eda3ae0195f7 SHA1 b5688b9926a20fc5b51b8243c7a2307e11d41c03 SHA256 0a1b4a957b8ed48bba6a1a41f3c27c13e4536bcfb2557c66a40acf4037f3b951
 MISC metadata.xml 574 RMD160 ccd927f3a387710bbf53f3f0f88c971dc814c605 SHA1 8160c080306039e0b3b18ced75ae6b81b8590ddc SHA256 9a3ca872da01db519865e7753e9c0922fe56972f4d6e27cbf5622afd41d23300
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwDYIAACgkQgAnW8HDreRYqLwCbBOZN4HjWMbuSqgw3+29C1Yi7
-5mEAnifMrYmu3FdTL9LJobCVlBn1NX5J
-=rQYo
+iEYEARECAAYFAkwNMCwACgkQgAnW8HDreRYYhACgsOji55mDbfqXvEd8seTUUc6d
+fHMAnAx/0N21qfULTgouXhacCSjbhaS8
+=iq01
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/vtk/vtk-5.6.0-r2.ebuild b/sci-libs/vtk/vtk-5.6.0-r2.ebuild
index b8fce91a57cf49a8649ea6da5a59a5d3c6eda877..10e388da143cdbdcd49a188c8b183fd4c28c2786 100644 (file)
--- a/sci-libs/vtk/vtk-5.6.0-r2.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-r2.ebuild,v 1.2 2010/05/30 12:11:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0-r2.ebuild,v 1.3 2010/06/07 17:45:09 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -114,15 +114,15 @@ src_configure() {
                $(cmake-utils_use_build doc DOCUMENTATION)
                $(cmake-utils_use java VTK_USE_JAVA)
                $(cmake-utils_use mpi VTK_USE_MPI)
-               $(cmake-utils_use ogg VTK_USE_OGGTHEORA_ENCODER)
                $(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 tk VTK_USE_TK)
                $(cmake-utils_use threads VTK_USE_PARALLEL)
                $(cmake-utils_use R VTK_USE_GNU_R) )
 
-       use ogg &&
+       use theora &&
        mycmakeargs+=(-DVTK_USE_SYSTEM_OGGTHEORA=ON)
 
        # mpi needs the parallel framework