Remove section with external tools from doc building CMakefile, wrt bug #453432. Thanks to Diego Elio Pettenò for discovering this issue

(Portage version: 2.2.0_alpha153/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 76 insertions, 3 deletions

diff --git a/media-libs/opencolorio/ChangeLog b/media-libs/opencolorio/ChangeLog
index 8944e2086a9d..f90df95b6376 100644
--- a/media-libs/opencolorio/ChangeLog
+++ b/media-libs/opencolorio/ChangeLog
@@ -1,6 +1,11 @@
 # 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.1 2013/01/16 05:47:02 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencolorio/ChangeLog,v 1.2 2013/01/22 05:11:08 pinkbyte Exp $
+
+  22 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> opencolorio-1.0.8.ebuild,
+  +files/opencolorio-1.0.8-remove-external-doc-utilities.patch:
+  Remove section with external tools from doc building CMakefile, wrt bug
+  #453432. Thanks to Diego Elio Pettenò for discovering this issue
 
 *opencolorio-1.0.8 (16 Jan 2013)
 *opencolorio-1.0.7 (16 Jan 2013)
diff --git a/media-libs/opencolorio/files/opencolorio-1.0.8-remove-external-doc-utilities.patch b/media-libs/opencolorio/files/opencolorio-1.0.8-remove-external-doc-utilities.patch
new file mode 100644
index 000000000000..270e67acb31e
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.0.8-remove-external-doc-utilities.patch
@@ -0,0 +1,65 @@
+--- docs/CMakeLists.txt.orig	2013-01-22 08:58:12.426195213 +0400
++++ docs/CMakeLists.txt	2013-01-22 08:58:25.201194476 +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 ###
+ 
diff --git a/media-libs/opencolorio/opencolorio-1.0.8.ebuild b/media-libs/opencolorio/opencolorio-1.0.8.ebuild
index c08bb2d7acd7..db9c6e211f85 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.1 2013/01/16 05:47:02 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencolorio/opencolorio-1.0.8.ebuild,v 1.2 2013/01/22 05:11:08 pinkbyte Exp $
 
 EAPI=5
 
@@ -41,7 +41,10 @@ REQUIRED_USE="doc? ( python )"
 # Restricting tests, bugs #439790 and #447908
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${P}-documentation-gen.patch"  )
+PATCHES=(
+	"${FILESDIR}/${P}-documentation-gen.patch"
+	"${FILESDIR}/${P}-remove-external-doc-utilities.patch"
+)
 
 pkg_setup() {
 	if use python; then