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

Package-Manager: portage-2.2.0_alpha153/cvs/Linux x86_64

4 files changed, 79 insertions, 5 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/Manifest b/media-libs/opencolorio/Manifest
index dff2e2560643..3e3184da9335 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,10 +1,11 @@
 AUX opencolorio-1.0.7-documentation-gen.patch 4518 SHA256 bd128a455ce88d7462394e2e78b8b63a90757f37afc6149342210e8f06a8117f SHA512 c65e330044033b13f9e912aafc5276ae2e597b154097c01b52b28dc7217265ec2d43a4fb24ab91033c0dcf3d5979cc36a28a85a6bbbf0939ed206ffda3ca4629 WHIRLPOOL 659fe85f77157411b2c75ed90f0f48808d4dffbacd38a4fd8c1dcdf1923a2f6af99997091d110e99af061abc1947dec0d26513458a46a50fd3bed74e087141c8
 AUX opencolorio-1.0.8-documentation-gen.patch 1974 SHA256 689881af2268ac39fcabe4d810960e7ce2c7a488137f5e3559641e50f1b22775 SHA512 6f294b172ea1e147ca328a2fe8baada51e9ae192b0792d951469bba63d63d803f67249d16e11a71b7098909c9590ef2942e606b11ecc7fd329582a55d14df4db WHIRLPOOL 9dffd7e91a71915804d73d8805c4ee32914a43950395919570076ddfe928a6be20270b59bff1681fa768cea6b0ab6ffb9fb4cdc138062b3125bb4adbec0bcb65
+AUX opencolorio-1.0.8-remove-external-doc-utilities.patch 2660 SHA256 c8e9d0d64fc193a587fd4b02bb838401e40e37f879453017bec61ec6f52a63af SHA512 78c1ee8c6bb873d71068c9cf78dfb9482b322948525bff4dd60749ba2e52baa23cecc081492bb48eb4197eff7a88afd46221b597555e99247fe89c9f8f2802bb WHIRLPOOL 14f9ffeba30d870246f9c1c5e36721753b0348e1b8d92337579c2ce6bf6d86da787e3f15cdbc09250bc93f8e98127e69a00e9242e5367dc10e8d7d9145920af9
 AUX opencolorio-openimageio.patch 931 SHA256 e7e41dcd784510c3d036474f33b8a4a8bcaf915b8571f50aa8d67d6accb2c633 SHA512 d3547b7a9f7699914cddb9f2493c1e97d69d0b1fbfe04295286dfec5815425ad1666cede9782176f12a1d56ff6ce502d493abd00d09def7e964ef03478449f30 WHIRLPOOL e7fbf82e3febaa5ce29a8da123a5211849f6eb6a7b2660f5a94e0dea6189a5ebd4d6a4c9d146012fe9f12cbbfb5aa12c7cf8f6b2afab792fbedfb5d969f7897b
 AUX opencolorio-use-system-libs.patch 984 SHA256 423f24c9d913e052cbcb863dcda9d9eb6166473a6ba133d04692b1bd8149a721 SHA512 8c98d02ebb29c8e085f96dbe59c79ae2bb57de19b73c3b06f6e374181e2bca624d20ad0a5d386cbc68e3f81e7427f43c0867ed7c74e86916d47f9c0fa63c4513 WHIRLPOOL 7a3bb0099347e048d324dfe19099dbc6184405a45d5d98ad3434546f58f6ccb32eabebb9fd7c7bfdb352c8b55d058e8051627326bb96d1f42034cfa547d1b4be
 DIST opencolorio-1.0.7.tar.gz 11844185 SHA256 54c6516a89dc9287f1bcc47f27a91fb608477295a4ba6106b45f34e89506d7d5 SHA512 34a9a92aa0cabb449e14fbca32ece1ba411b8d8154cb459e5a88d63bd0b43ffd9b6eeda324339cbd0e8f51b086a34235a984030647b766342c41dc1ec633a70a WHIRLPOOL 6701f1446c1540e2400982f1cd1961803c9e9bde50bd34bff46fd819366d1226defa0334fe1610d3b3ee4d30a04530bdecad89363fd480ea025391382b0e4537
 DIST opencolorio-1.0.8.tar.gz 11912207 SHA256 9b6d540040e29394045c724c1a46ea00913e660269b03bf24790c74a5542adb4 SHA512 16c0deab84013d96c9741a58ddc44a90be6a6eac317b8ceb87afad914aa9b0e1d5880dc11ae3c40d22e4a87b553e3b5a1a8a66c064f71c2203b4b605a97851a1 WHIRLPOOL 32b92dffa07873f2ea0635afc189937c4d695cb40f5a9d112489a98140d36524db3aadd53db9e9f6e6069f3f29f9d17a10883ae6f26d4144b7873ebfb944cb5a
 EBUILD opencolorio-1.0.7.ebuild 2077 SHA256 8af18c37147eb7f48ea80e64ae00f187f9d5b591d66c1012c772c46fd3a6109e SHA512 6d2e0ee0276a9fca93014bd9b95f6bdbbd95628eb28ca848501c59b9c284bfd51c7b3903d30bd9cf493696e3de9b536b86bc5ca147a0a19f58819dd50cad1597 WHIRLPOOL 70e82e8f788d6a8bdd90578e0aa4c62045a129dffadb989e6db537076a83d6e0625dd0caaae012d6e785a749a768279af1dae50bf84e15dcf8b9c3316e84e0d1
-EBUILD opencolorio-1.0.8.ebuild 2052 SHA256 58bfee2a3d1f44d03c3c267e0c8c753d8f628ad5a119c37c09990e2f8bbe1beb SHA512 ea3bded775e3c616394c60001bd8c7b8e454330c218ee2ba276f730481e8a768c4c6fbb02772bef1402d52e0f4f313f6fa73ce150ff52ab108a40e8a3319d32e WHIRLPOOL d1db0751dc97deb5d8485c699ac78bfbbadbdbfb624877b4d10bde4b345ecd5a07dddba1b8e7acea6069db78fc159dfcef330a191dc50d2040bfe3929a88a05a
-MISC ChangeLog 654 SHA256 778e613b7d4bb52f33f007133b227b9cc8f4ba5cdd3247233eb9a54a2d323411 SHA512 f99229303d70814c46f36caf32e8ff9327a3206b095df2f2ac720791e3b96821a2328f867dd42b1570a5bb32fd291274a8f62e3b6abb8fcaf9465288cb43239c WHIRLPOOL d0cd5f6ce26ccec700f10cfd78d2f0624287b3fb1913dbe4329422d51d95392245f630b79b34695ace460761277e83baa699729e355fd256c48f8c864d868a28
+EBUILD opencolorio-1.0.8.ebuild 2108 SHA256 2760b99a2b6f751c3bcbcbaff835b5caabe520b889c4b339df22f5e0438b07e2 SHA512 2a7c357dd8e85f85e5e2a4becb255cf237a0a9e76b7b1b222cd961e328c4916cb02119b2cc8966ce19791d237f03eb9e0a30c66759fd86892884937319d7309d WHIRLPOOL 9eb8c422a33b85a8a10e9aabdd1414ee0604715bb859917b65f32948836e4f7e48fa0f9919df5ee480f655f3c2dc7074d2aa35d0ad9edbc77a3dfc4b14032e96
+MISC ChangeLog 937 SHA256 1266d6aad911987e491eb7d163404b0a98a479639210e8fcf2df522fcf262596 SHA512 8a6afcd96593103a5586b61e8d9fcf195a1aae5c4a620e27a6d76b7e0bad142a8fafa0844ddede1a1cb03bcc5768c78424bf54668e8b5cf23c766d11b6c06e07 WHIRLPOOL f1f9d13e93841aa87b48e817932c440dd3ea517d8be5bd317ca5f89bca1642e9fcb6b2d4145aa42405acb2354dbfe9533d3df335b85a79ae9eaa2528d7dc1a5d
 MISC metadata.xml 544 SHA256 cca1e5a05bdb57fe803723d06e2e29062a019146f2a5bea7cb254d5c75a2f492 SHA512 5036a28ff493ffa28fa067b9644cf0e18cf4f0a0a6ed5b83f06365ac626ae9d8a41aafb5e1d71a12163e37cb0376e3940d2f407b663854412cb4ca70cc562ef6 WHIRLPOOL d72b1ab3523da33ad645e74206ff7dcd7f3190b84174dae9a57eafb9878502708a679a9c0dddfca8f00c4dc42a7656e7133ccef92a74a0c9d8c73cdb3e34baee
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