Version bump, drop old. Correct python USE dependencies

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

7 files changed, 101 insertions, 192 deletions

diff --git a/media-libs/opencolorio/ChangeLog b/media-libs/opencolorio/ChangeLog
index 3c03f88d8704..07b36cf778ed 100644
--- a/media-libs/opencolorio/ChangeLog
+++ b/media-libs/opencolorio/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/opencolorio
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencolorio/ChangeLog,v 1.7 2013/07/05 11:04:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencolorio/ChangeLog,v 1.8 2013/09/24 11:01:49 pinkbyte Exp $
+
+*opencolorio-1.0.9 (24 Sep 2013)
+
+  24 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> -opencolorio-1.0.7.ebuild,
+  -files/opencolorio-1.0.7-documentation-gen.patch, opencolorio-1.0.8.ebuild,
+  +opencolorio-1.0.9.ebuild,
+  +files/opencolorio-1.0.9-remove-external-doc-utilities.patch,
+  -files/opencolorio-openimageio.patch,
+  -files/opencolorio-use-system-libs.patch:
+  Version bump, drop old. Correct python USE dependencies
 
   05 Jul 2013; Agostino Sarubbo <ago@gentoo.org> opencolorio-1.0.8.ebuild:
   Stable for x86, wrt bug #475790
diff --git a/media-libs/opencolorio/files/opencolorio-1.0.7-documentation-gen.patch b/media-libs/opencolorio/files/opencolorio-1.0.7-documentation-gen.patch
deleted file mode 100644
index 172d50d1d6dd..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.0.7-documentation-gen.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- docs/CMakeLists.txt.orig	2012-11-26 11:05:55.000000000 +0400
-+++ docs/CMakeLists.txt	2012-11-26 11:07:42.622459004 +0400
-@@ -1,62 +1,3 @@
--
--###############################################################################
--### External Doc Apps ###
--
--# setuptools
--set(SETUPTOOLS_VERSION 0.6c11)
--ExternalProject_Add(setuptools
--    URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
--    BUILD_IN_SOURCE 1
--    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# docutils
--set(DOCUTILS_VERSION 0.7)
--ExternalProject_Add(docutils
--    DEPENDS setuptools
--    URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
--    BUILD_IN_SOURCE 1
--    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# jinja2
--set(JINJA2_VERSION 2.5.5)
--ExternalProject_Add(Jinja2
--    DEPENDS setuptools
--    URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
--    BUILD_IN_SOURCE 1
--    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# Pygments
--set(PYGMENTS_VERSION 1.3.1)
--ExternalProject_Add(Pygments
--    DEPENDS setuptools
--    URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
--    BUILD_IN_SOURCE 1
--    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# sphinx
--set(SPHINX_VERSION f52b631f501a) # 1.1pre
--ExternalProject_Add(Sphinx
--    DEPENDS setuptools docutils Jinja2 Pygments
--    URL ${CMAKE_SOURCE_DIR}/ext/sphinx-${SPHINX_VERSION}.tar.gz
--    PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/sphinx-${SPHINX_VERSION}.patch
--    BUILD_IN_SOURCE 1
--    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin
--)
--
- ###############################################################################
- ### Create Doc Targets ###
- 
-@@ -81,7 +22,7 @@
- ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst)
- 
- add_custom_target(doc ALL
--    COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
-+    COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
-     DEPENDS
-         OpenColorIO
-         PyOpenColorIO
-@@ -93,19 +34,17 @@
-     COMMENT "Building html docs"
-     SOURCES ${DOCFILES})
- 
--# note: ExternalProject will not build when added to a add_custom_target this
--# works around this problem. This seems to be fixed in the cmake ^HEAD
--add_dependencies(doc Sphinx) 
--
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/html
-         PATTERN .git EXCLUDE)
- 
-+if(OCIO_BUILD_PDF_DOCS)
-+
- find_package(LATEX)
- if(PDFLATEX_COMPILER)
-     
-     add_custom_target(latex
--        COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
-+        COMMAND PYTHONPATH= sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
-         DEPENDS
-             OpenColorIO
-             ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -115,7 +54,6 @@
-             ${RSTDOC_OUTPUT}
-         COMMENT "Building latex doc"
-         SOURCES ${DOCFILES})
--    add_dependencies(latex Sphinx)
-     
-     add_custom_target(pdf ALL
-         COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
-@@ -125,6 +63,8 @@
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P})
-     
- endif()
-+
-+endif()
diff --git a/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch b/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch
new file mode 100644
index 000000000000..921327d0f1a1
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch
@@ -0,0 +1,65 @@
+--- docs/CMakeLists.txt.orig	2013-09-24 13:13:47.572222731 +0400
++++ docs/CMakeLists.txt	2013-09-24 13:14:07.931224505 +0400
+@@ -1,62 +1,3 @@
+-
+-###############################################################################
+-### External Doc Apps ###
+-
+-# distribute
+-set(DISTRIBUTE_VERSION 0.6.36)
+-ExternalProject_Add(distribute
+-    URL ${CMAKE_SOURCE_DIR}/ext/distribute-${DISTRIBUTE_VERSION}.tar.gz
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+-)
+-
+-# docutils
+-set(DOCUTILS_VERSION 0.10)
+-ExternalProject_Add(docutils
+-    DEPENDS distribute
+-    URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+-)
+-
+-# jinja2
+-set(JINJA2_VERSION 2.5.5)
+-ExternalProject_Add(Jinja2
+-    DEPENDS distribute
+-    URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+-)
+-
+-# Pygments
+-set(PYGMENTS_VERSION 1.3.1)
+-ExternalProject_Add(Pygments
+-    DEPENDS distribute
+-    URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+-)
+-
+-# sphinx
+-set(SPHINX_VERSION 1.2b1)
+-ExternalProject_Add(Sphinx
+-    DEPENDS distribute docutils Jinja2 Pygments
+-    URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz
+-    PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin
+-)
+-
+ ###############################################################################
+ ### Create Doc Targets ###
+ 
diff --git a/media-libs/opencolorio/files/opencolorio-openimageio.patch b/media-libs/opencolorio/files/opencolorio-openimageio.patch
deleted file mode 100644
index 89b7042d47f8..000000000000
--- a/media-libs/opencolorio/files/opencolorio-openimageio.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://github.com/cjwills/OpenColorIO/commit/36c59cb788adc20219f6086bccd893531d0cec43
-
---- src/apps/ocioconvert/main.cpp
-+++ src/apps/ocioconvert/main.cpp
-@@ -35,7 +35,9 @@
- 
- #include <OpenImageIO/imageio.h>
- #include <OpenImageIO/typedesc.h>
-+#if defined OIIO_VERSION && (OIIO_VERSION<10100)
- namespace OIIO = OIIO_NAMESPACE;
-+#endif
- 
- #include "argparse.h"
- 
---- src/apps/ociodisplay/main.cpp
-+++ src/apps/ociodisplay/main.cpp
-@@ -53,7 +53,9 @@
- 
- #include <OpenImageIO/imageio.h>
- #include <OpenImageIO/typedesc.h>
-+#if defined OIIO_VERSION && (OIIO_VERSION<10100)
- namespace OIIO = OIIO_NAMESPACE;
-+#endif
- 
- GLint g_win = 0;
- int g_winWidth = 0;
---- src/apps/ociolutimage/main.cpp
-+++ src/apps/ociolutimage/main.cpp
-@@ -32,7 +32,9 @@
- 
- #include <OpenImageIO/imageio.h>
- #include <OpenImageIO/typedesc.h>
-+#if defined OIIO_VERSION && (OIIO_VERSION<10100)
- namespace OIIO = OIIO_NAMESPACE;
-+#endif
- 
- #include "argparse.h"
- 
diff --git a/media-libs/opencolorio/files/opencolorio-use-system-libs.patch b/media-libs/opencolorio/files/opencolorio-use-system-libs.patch
deleted file mode 100644
index 10a931551258..000000000000
--- a/media-libs/opencolorio/files/opencolorio-use-system-libs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- CMakeLists.txt.orig	2012-08-18 14:47:17.449263203 +0400
-+++ CMakeLists.txt	2012-08-18 14:47:34.102263732 +0400
-@@ -28,11 +28,10 @@
- option(OCIO_USE_BOOST_PTR "Set to ON to enable boost shared_ptr (necessary when tr1 is not available)" OFF)
- 
- option(OCIO_PYGLUE_RESPECT_ABI "If ON, the Python module install path includes Python UCS version" OFF)
--if(UNIX AND NOT APPLE)
--    option(USE_EXTERNAL_YAML "Use system installed yaml-cpp library." OFF)
--    option(USE_EXTERNAL_TINYXML "Use system installed tinyxml library." OFF)
--    option(USE_EXTERNAL_LCMS "Use system install lcms2 library." OFF)
--endif()
-+
-+option(USE_EXTERNAL_YAML "Use system installed yaml-cpp library." ON)
-+option(USE_EXTERNAL_TINYXML "Use system installed tinyxml library." ON)
-+option(USE_EXTERNAL_LCMS "Use system install lcms2 library." ON)
- 
- # This does not include the SOVERSION override, on purpose, so that the
- # OCIO_VERSION value will be an accurate reflection of the underlying library version.
diff --git a/media-libs/opencolorio/opencolorio-1.0.8.ebuild b/media-libs/opencolorio/opencolorio-1.0.8.ebuild
index 1fc508d294f7..9fd963f3c4d9 100644
--- a/media-libs/opencolorio/opencolorio-1.0.8.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencolorio/opencolorio-1.0.8.ebuild,v 1.7 2013/07/05 11:04:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencolorio/opencolorio-1.0.8.ebuild,v 1.8 2013/09/24 11:01:50 pinkbyte Exp $
 
 EAPI=5
 
@@ -31,8 +31,8 @@ RDEPEND="opengl? (
 	"
 DEPEND="${RDEPEND}
 	doc? (
-		pdf? ( dev-python/sphinx[latex] )
-		!pdf? ( dev-python/sphinx )
+		pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] )
+		!pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	)
 	"
 
diff --git a/media-libs/opencolorio/opencolorio-1.0.7.ebuild b/media-libs/opencolorio/opencolorio-1.0.9.ebuild
index 32de186287ca..c55e11f98153 100644
--- a/media-libs/opencolorio/opencolorio-1.0.7.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.0.9.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencolorio/opencolorio-1.0.7.ebuild,v 1.2 2013/06/23 18:12:41 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencolorio/opencolorio-1.0.9.ebuild,v 1.1 2013/09/24 11:01:50 pinkbyte Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="python? 2"
+# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump
+PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python vcs-snapshot
+inherit cmake-utils python-single-r1 vcs-snapshot
 
 DESCRIPTION="A color management framework for visual effects and animation"
 HOMEPAGE="http://opencolorio.org/"
-SRC_URI="https://github.com/imageworks/OpenColorIO/tarball/v${PV} \
+SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz \
 		-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc opengl pdf python sse2 test"
 
 RDEPEND="opengl? (
@@ -25,13 +26,14 @@ RDEPEND="opengl? (
 		media-libs/freeglut
 		virtual/opengl
 		)
+	python? ( ${PYTHON_DEPS} )
 	=dev-cpp/yaml-cpp-0.3*
 	dev-libs/tinyxml
 	"
 DEPEND="${RDEPEND}
 	doc? (
-		pdf? ( dev-python/sphinx[latex] )
-		!pdf? ( dev-python/sphinx )
+		pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] )
+		!pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	)
 	"
 
@@ -41,18 +43,19 @@ REQUIRED_USE="doc? ( python )"
 # Restricting tests, bugs #439790 and #447908
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.8-documentation-gen.patch"
+	"${FILESDIR}/${P}-remove-external-doc-utilities.patch"
+)
+
 pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-use-system-libs.patch \
-		"${FILESDIR}"/${P}-documentation-gen.patch \
-		"${FILESDIR}"/${PN}-openimageio.patch
+	cmake-utils_src_prepare
+
+	use python && python_fix_shebang .
 }
 
 src_configure() {
@@ -69,6 +72,9 @@ src_configure() {
 		-DOCIO_BUILD_STATIC=OFF
 		-DOCIO_STATIC_JNIGLUE=OFF
 		-DOCIO_BUILD_TRUELIGHT=OFF
+		-DUSE_EXTERNAL_LCMS=ON
+		-DUSE_EXTERNAL_TINYXML=ON
+		-DUSE_EXTERNAL_YAML=ON
 		$(cmake-utils_use doc OCIO_BUILD_DOCS)
 		$(cmake-utils_use opengl OCIO_BUILD_APPS)
 		$(cmake-utils_use pdf OCIO_BUILD_PDF_DOCS)