commit: 1e76cacb7c6e5105c343e028dcf0722e88e74260
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 11:01:37 2018 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 26 11:01:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e76cacb
media-libs/opencolorio: Remove 1.0.9-r2
Overshadowed by 1.1.0-r1.
Package-Manager: Portage-2.3.39, Repoman-2.3.9
media-libs/opencolorio/Manifest | 2 -
.../opencolorio-1.0.8-documentation-gen.patch | 54 --------------
...lorio-1.0.9-remove-external-doc-utilities.patch | 65 ----------------
media-libs/opencolorio/metadata.xml | 4 -
media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild | 87 ----------------------
5 files changed, 212 deletions(-)
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 61692b3aa83..43489473eb6 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,3 +1 @@
-DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B
6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4
SHA512
8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc
-DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B
54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da
SHA512
f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B
555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152
SHA512
909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
diff --git
a/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch
b/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch
deleted file mode 100644
index 7a396b3b735..00000000000
--- a/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/docs/CMakeLists.txt 2013-01-08 03:19:23.649162615 +0400
-+++ b/docs/CMakeLists.txt 2013-01-08 03:22:29.647329174 +0400
-@@ -81,7 +81,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,20 +93,18 @@
- 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 .* 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 sphinx-build -b latex .
${CMAKE_CURRENT_BINARY_DIR}/build-latex
- DEPENDS
- OpenColorIO
- ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -116,7 +114,6 @@
- ${RSTDOC_OUTPUT}
- COMMENT "Building latex doc"
- SOURCES ${DOCFILES})
-- add_dependencies(latex Sphinx)
-
- add_custom_target(pdf ALL
- COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
-@@ -126,6 +123,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
deleted file mode 100644
index d30b662e613..00000000000
---
a/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/docs/CMakeLists.txt 2013-09-24 13:13:47.572222731 +0400
-+++ b/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/metadata.xml
b/media-libs/opencolorio/metadata.xml
index 8622e02f2f8..ea85c9e1ea2 100644
--- a/media-libs/opencolorio/metadata.xml
+++ b/media-libs/opencolorio/metadata.xml
@@ -6,10 +6,6 @@
<name>Gentoo Graphics Project</name>
</maintainer>
<longdescription lang="en">OpenColorIO (OCIO) is a complete color
management solution geared towards motion picture production with an emphasis
on visual effects and computer animation.</longdescription>
- <use>
- <flag name="pdf"
restrict="<=media-libs/opencolorio-1.1.0-r1">
- Install extra documentation in PDF format</flag>
- </use>
<upstream>
<remote-id type="github">imageworks/OpenColorIO</remote-id>
</upstream>
diff --git a/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild
b/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild
deleted file mode 100644
index 1d80450f58a..00000000000
--- a/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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-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/archive/v${PV}.tar.gz \
- -> ${P}.tar.gz
-
https://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-yaml-0.5-compat-v2.patch.bz2";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc opengl pdf python cpu_flags_x86_sse2 test"
-
-RDEPEND="opengl? (
- media-libs/lcms:2
- >=media-libs/openimageio-1.1.0
- media-libs/glew:0=
- media-libs/freeglut
- virtual/opengl
- )
- python? ( ${PYTHON_DEPS} )
- >=dev-cpp/yaml-cpp-0.5
- dev-libs/tinyxml
- "
-DEPEND="${RDEPEND}
- doc? (
- pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] )
- !pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- )
- "
-
-# Documentation building requires Python bindings building
-REQUIRED_USE="doc? ( python ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.8-documentation-gen.patch"
- "${FILESDIR}/${P}-remove-external-doc-utilities.patch"
- "${WORKDIR}/${P}-yaml-0.5-compat-v2.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- use python && python_fix_shebang .
-}
-
-src_configure() {
- # Missing features:
- # - Truelight and Nuke are not in portage for now, so their support are
disabled
- # - Java bindings was not tested, so disabled
- # Notes:
- # - OpenImageIO is required for building ociodisplay and ocioconvert
(USE opengl)
- # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE
opengl)
- local mycmakeargs=(
- -DOCIO_BUILD_JNIGLUE=OFF
- -DOCIO_BUILD_NUKE=OFF
- -DOCIO_BUILD_SHARED=ON
- -DOCIO_BUILD_STATIC=OFF
- -DOCIO_STATIC_JNIGLUE=OFF
- -DOCIO_BUILD_TRUELIGHT=OFF
- -DUSE_EXTERNAL_LCMS=ON
- -DUSE_EXTERNAL_TINYXML=ON
- -DUSE_EXTERNAL_YAML=ON
- -DOCIO_BUILD_DOCS="$(usex doc)"
- -DOCIO_BUILD_APPS="$(usex opengl)"
- -DOCIO_BUILD_PDF_DOCS="$(usex pdf)"
- -DOCIO_BUILD_PYGLUE="$(usex python)"
- -DOCIO_USE_SSE="$(usex cpu_flags_x86_sse2)"
- -DOCIO_BUILD_TESTS="$(usex test)"
- )
- cmake-utils_src_configure
-}
