diff --git a/media-libs/opencolorio/metadata.xml b/media-libs/opencolorio/metadata.xml
index 3669d74..77fc942 100644
--- a/media-libs/opencolorio/metadata.xml
+++ b/media-libs/opencolorio/metadata.xml
@@ -9,4 +9,7 @@
   <upstream>
     <remote-id type="github">AcademySoftwareFoundation/OpenColorIO</remote-id>
   </upstream>
+  <use>
+    <flag name="apps">Build helper programs</flag>
+  </use>
 </pkgmetadata>
diff --git a/media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild b/media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild
new file mode 100644
index 0000000..58b17a2
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit flag-o-matic python-single-r1 multilib cmake
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO.git"
+else
+	SRC_URI="
+		https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v"${PV}".tar.gz -> "${P}".tar.gz
+	"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/OpenColorIO-"${PV}""
+fi
+
+#Missing:
+# Java bindings
+# GPU tests, do not work in sandbox
+
+LICENSE="BSD"
+SLOT="0/2"
+IUSE="apps cpu_flags_x86_sse2 doc python test"
+REQUIRED_USE="
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=dev-cpp/pystring-1.1.3
+	>=dev-cpp/yaml-cpp-0.6.3
+	>=dev-libs/expat-2.2.5
+	>=media-libs/ilmbase-2.3.0
+	apps? (
+		>=media-libs/lcms-2.2
+		>=media-libs/openimageio-2.1.9:=
+	)
+	python? (
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/testresources[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_press_theme[${PYTHON_USEDEP}]
+			dev-python/sphinx-tabs[${PYTHON_USEDEP}]
+			dev-python/breathe[${PYTHON_USEDEP}]
+		')
+	)
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-python/pybind11-2.4.3[${PYTHON_USEDEP}]
+			test? ( dev-python/numpy[${PYTHON_USEDEP}] )
+		')
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i "s/DESTINATION lib/DESTINATION $(get_libdir)/" "${S}"/src/OpenColorIO/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Filter -ffp-contract=fast
+	# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1361
+	filter-flags -ffp-contract=fast && append-flags -ffp-contract=on
+
+	local mycmakeargs=(
+		-DLIB_SUFFIX=""
+		-DBUILD_SHARED_LIBS=ON
+		-DOCIO_BUILD_APPS=$(usex apps)
+		-DOCIO_BUILD_DOCS=$(usex doc)
+		-DOCIO_BUILD_PYTHON=$(usex python)
+		-DOCIO_BUILD_JAVA=OFF
+		-DOCIO_BUILD_TESTS=$(usex test)
+		-DOCIO_BUILD_GPU_TESTS=OFF
+		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+		-DOCIO_INSTALL_EXT_PACKAGES=NONE
+
+	)
+	cmake_src_configure
+}