media-libs/opencolorio-1.0.9-r2: stable on amd64 and x86

Previous revision is broken, stabilize this one and remove broken
from tree

Package-Manager: portage-2.3.0_rc1

3 files changed, 1 insertions, 90 deletions

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index cd8b0ecaa7c9..7f1743aa7641 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,4 +1,3 @@
 DIST opencolorio-1.0.8.tar.gz 11912207 SHA256 9b6d540040e29394045c724c1a46ea00913e660269b03bf24790c74a5542adb4 SHA512 16c0deab84013d96c9741a58ddc44a90be6a6eac317b8ceb87afad914aa9b0e1d5880dc11ae3c40d22e4a87b553e3b5a1a8a66c064f71c2203b4b605a97851a1 WHIRLPOOL 32b92dffa07873f2ea0635afc189937c4d695cb40f5a9d112489a98140d36524db3aadd53db9e9f6e6069f3f29f9d17a10883ae6f26d4144b7873ebfb944cb5a
 DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 SHA256 13fa49b03a792122aa416e07a69c52d6bde71b91882d77784ade4d14bac952b8 SHA512 8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc WHIRLPOOL 0a0bbc1a787793ee7275a3c6f31ecc9b65581ae6cd07a5a93c12e02fc26e33b98521366e26efa92879474b833cbe2f5c4148d2ec88ad80afb63260b8a67dfed9
-DIST opencolorio-1.0.9-yaml-0.5-compat.patch.bz2 14128 SHA256 917d64ea318da52286713742a9b54b9663326fabc90d8fb94697f8f1b672f344 SHA512 163009deb3bd2446fb203022f26c942fc09e39428f2f628dcd553e7b69f2b625c2c6962e8b5d4c0800c7edb7a776fa255a0223005dedf2b2f974752dfa4abfb6 WHIRLPOOL b14d7379261af2b61e674ed99ab8fe6345b67e6412be0fd8a59f5ae32bd29396ef274310cfaec0e74b2f46f7bf3611ad77cfc74af5a08ed27a92eed2936af104
 DIST opencolorio-1.0.9.tar.gz 12473406 SHA256 0f3b458f69715a942047a7b76545c6a098b632e9e5e71d5caaa756d5f7356aa6 SHA512 f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8 WHIRLPOOL e622d71d40cfdba664178df38d66ecd990515afe4fff0260952bca29e6d46beba47446b6bd36c9965a8169c966a0bddf9bcb5b41f7857ed355ac1a6299c9de6c
diff --git a/media-libs/opencolorio/opencolorio-1.0.9-r1.ebuild b/media-libs/opencolorio/opencolorio-1.0.9-r1.ebuild
deleted file mode 100644
index f05336b0a16c..000000000000
--- a/media-libs/opencolorio/opencolorio-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# 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.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
-		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 )"
-
-# 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.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
-		$(cmake-utils_use doc OCIO_BUILD_DOCS)
-		$(cmake-utils_use opengl OCIO_BUILD_APPS)
-		$(cmake-utils_use pdf OCIO_BUILD_PDF_DOCS)
-		$(cmake-utils_use python OCIO_BUILD_PYGLUE)
-		$(cmake-utils_use cpu_flags_x86_sse2 OCIO_USE_SSE)
-		$(cmake-utils_use test OCIO_BUILD_TESTS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild b/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild
index d9c75d89d0d1..3b7749e3b863 100644
--- a/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz \
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc opengl pdf python cpu_flags_x86_sse2 test"
 
 RDEPEND="opengl? (