diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 3909e90..4088044 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1 +1,2 @@
+DIST opencolorio-2.0.0_beta2.tar.gz 9736951 BLAKE2B 576ba6ed532e8be42e59ca9b28dfebe6af42ab249132f009a07d46e7bc9368e1b25a8ecf8d283d05b8d9f2ae0838d0ac3953e4d4fa7c10bbe244b09f1564488d SHA512 229b9f1bcd42267e986a4647c84f84a8afec1f4a5d9d5a53504e4c97dc1b00137967e756e033808476a4608d9a0238d9c8b228e42d1fcd31632a69ec0ed62044
 DIST opencolorio-2.0.0_pre20201211.tar.gz 9810813 BLAKE2B fe3d5be0f00eeffef0123d0969867f945a89e7887b8adeef6d1f859d57ddf9cee04b19cd799525944653b1440b0a519a1ed450f4e81e978d675c5b530b1efa5b SHA512 a3ecb91736ea8826afb3ac8f734e6eda63165895af33975ea92c0c5c77bae0be2db57afd0f8f423297d4450ce9cda51e5ab9cdd8737836429ea868cb362107b6
diff --git a/media-libs/opencolorio/opencolorio-2.0.0_beta2.ebuild b/media-libs/opencolorio/opencolorio-2.0.0_beta2.ebuild
new file mode 100644
index 0000000..84efe6f
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.0.0_beta2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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
+	MY_P=$(ver_rs 3 '-')
+	SRC_URI="
+		https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v"${MY_P}".tar.gz -> "${P}".tar.gz
+	"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/OpenColorIO-"${MY_P}""
+fi
+
+# TODO
+# doc, Python and Java bindings
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 opengl test"
+#REQUIRED_USE="
+#	doc? ( python )
+#	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-cpp/pystring
+	>=dev-cpp/yaml-cpp-0.5
+	dev-libs/tinyxml
+	dev-python/pybind11
+	opengl? (
+		media-libs/lcms:2
+		media-libs/openimageio
+		media-libs/glew:=
+		media-libs/freeglut
+		virtual/opengl
+	)
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+# No doc for now, as sphinx-tabs isnt in the main repo but in guru and due sphinx-press-theme not being done yet.
+# + python bindings not working properly so they are omited for now
+#	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}]
+#		')
+#	)
+#"
+
+CMAKE_BUILD_TYPE="Release"
+
+PATCHES=(
+	"${FILESDIR}/opencolorio-2.0.0_libraries_to_lib64_instead_of_lib.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DOCIO_BUILD_APPS=$(usex opengl)
+#		-DOCIO_BUILD_DOCS=$(usex doc)
+#		-DOCIO_BUILD_PYTHON=$(usex python)
+		-DOCIO_BUILD_TESTS=$(usex test)
+		-DOCIO_BUILD_GPU_TESTS=$(usex test)
+		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+		-DOCIO_INSTALL_EXT_PACKAGES=NONE
+
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/opencolorio/opencolorio-2.0.0_pre20201211.ebuild b/media-libs/opencolorio/opencolorio-2.0.0_pre20201211.ebuild
index 2bd9fea..276f33d 100644
--- a/media-libs/opencolorio/opencolorio-2.0.0_pre20201211.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.0_pre20201211.ebuild
@@ -31,6 +31,7 @@ IUSE="cpu_flags_x86_sse2 opengl test"
 #	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
+	dev-cpp/pystring
 	>=dev-cpp/yaml-cpp-0.5
 	dev-libs/tinyxml
 	dev-python/pybind11
@@ -41,7 +42,6 @@ RDEPEND="
 		media-libs/freeglut
 		virtual/opengl
 	)
-	media-libs/pystring
 "
 
 DEPEND="${RDEPEND}"
diff --git a/media-libs/opencolorio/opencolorio-9999.ebuild b/media-libs/opencolorio/opencolorio-9999.ebuild
index 2bd9fea..84efe6f 100644
--- a/media-libs/opencolorio/opencolorio-9999.ebuild
+++ b/media-libs/opencolorio/opencolorio-9999.ebuild
@@ -12,12 +12,12 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO.git"
 else
-	COMMIT="55cbcf18b5d1bcb6e79f70b956f3edd2f7c0cf75" # 11.12.2020
+	MY_P=$(ver_rs 3 '-')
 	SRC_URI="
-		https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/"${COMMIT}".tar.gz -> "${P}".tar.gz
+		https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v"${MY_P}".tar.gz -> "${P}".tar.gz
 	"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/OpenColorIO-"${COMMIT}""
+	S="${WORKDIR}/OpenColorIO-"${MY_P}""
 fi
 
 # TODO
@@ -31,6 +31,7 @@ IUSE="cpu_flags_x86_sse2 opengl test"
 #	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
+	dev-cpp/pystring
 	>=dev-cpp/yaml-cpp-0.5
 	dev-libs/tinyxml
 	dev-python/pybind11
@@ -41,7 +42,6 @@ RDEPEND="
 		media-libs/freeglut
 		virtual/opengl
 	)
-	media-libs/pystring
 "
 
 DEPEND="${RDEPEND}"