media-libs/opencolorio: add 2.0.0_beta2 and adjust dependencies

Package-Manager: Portage-3.0.9, Repoman-3.0.2

app-emulation/anbox/anbox-0_pre20201129.ebuild

@@ -30,11 +30,11 @@ IUSE="X wayland systemd"
 
 DEPEND="
 	>=app-emulation/lxc-3.0.0
+	dev-cpp/properties-cpp
+	dev-cpp/sdbus-cpp
 	dev-libs/boost[threads]
 	dev-libs/expat
-	dev-libs/properties-cpp
 	dev-libs/protobuf
-	dev-libs/sdbus-cpp
 	media-libs/libsdl2
 	media-libs/glm
 	media-libs/mesa[egl,gles2]

app-emulation/anbox/anbox-9999.ebuild

@@ -30,11 +30,11 @@ IUSE="X wayland systemd"
 
 DEPEND="
 	>=app-emulation/lxc-3.0.0
+	dev-cpp/properties-cpp
+	dev-cpp/sdbus-cpp
 	dev-libs/boost[threads]
 	dev-libs/expat
-	dev-libs/properties-cpp
 	dev-libs/protobuf
-	dev-libs/sdbus-cpp
 	media-libs/libsdl2
 	media-libs/glm
 	media-libs/mesa[egl,gles2]

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

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
+}

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}"

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}"

media-video/olive/olive-9999.ebuild

@@ -27,13 +27,15 @@ COMMON_DEPEND="
 	>=dev-qt/qtopengl-5.6.0
 	>=dev-qt/qtsvg-5.6.0
 	>=dev-qt/qtwidgets-5.6.0
-	>=media-libs/opencolorio-2.0.0
+	>media-libs/opencolorio-1.9.9
 	media-libs/openexr
 	>=media-libs/openimageio-2.1.12
 	>=media-video/ffmpeg-3.0.0
 	virtual/opengl
 "
 #media-video/opentimelineio : The CMakeFile tries to find it, but doesnt do anything yet.
+# Wants opecolorio-2.0.0, but have to do >1.9.9 due to no proper release and portage not seeing prereleases and betas as being >=2.0.0
+
 DEPEND="
 	"${COMMON_DEPEND}"
 	>=dev-qt/qtconcurrent-5.6.0
@@ -62,7 +64,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Olive crashes at runtime when playing video"
+	einfo "Olive crashes at runtime when playing video"
-	elog "with ~ffmpeg-4.3. The current remedy is to"
+	einfo "with ~ffmpeg-4.3. The current remedy is to"
-	elog "use ~ffmpeg-4.2 or ffmpeg-9999 instead."
+	einfo "use ~ffmpeg-4.2 or ffmpeg-9999 instead."
 }

net-libs/libcurl-gnutls/Manifest

@@ -1,2 +0,0 @@
-DIST libcurl-gnutls-7.71.1-1-x86_64.pkg.tar.zst 236395 BLAKE2B 4771999b7336deadee1667592558a38be8a068bc01763473c2a7dc83a34de0b461b7cf4354d9fe6416eed6952ca2f89fa84ce9f0768182903fd7ff2230efef99 SHA512 4b706788c80d43f99f5e598345dcb6015eaddd4722b9a32a0a2120976ff291c37396d5e4351ca8562f4f18b3036f682238e1523017d4bad82c55690af1b5b835
-DIST libcurl-gnutls-7.73.0-1-x86_64.pkg.tar.zst 243589 BLAKE2B 7fc4ab1ea12a4b1c372d515aedb40f7f24e61fe2fef94f1bc176b15e4ff29cb2517d808e940b0a24eaa87e17e4c76385af4676117d17334550dd504e618a6649 SHA512 df41245d9db064060ac1c2b5e56c3b596970652414c7f42e26f5e18640e9202450d7f34ccb03c8a34346275c656ca480e9ea34619cfbbcb2fcc6c8bbb884b2ee

net-libs/libcurl-gnutls/libcurl-gnutls-7.71.1.ebuild

@@ -1,47 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-DESCRIPTION="libcurl libraries linked with gnutls"
-HOMEPAGE="https://curl.haxx.se"
-MIRROR_URI="https://mirror.rackspace.com/archlinux"
-SRC_URI="
-	amd64? (
-		${MIRROR_URI}/community/os/x86_64/${PN}-${PV}-1-x86_64.pkg.tar.zst
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror strip"
-
-COMMON_DEPEND="net-misc/curl[-curl_ssl_gnutls]"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zstd
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	net-libs/nghttp2
-	>=dev-libs/nettle-3.6
-"
-
-S="${WORKDIR}"
-
-#QA_PRESTRIPPED="
-#	/usr/lib/libcurl-gnutls-4.5.0
-#	/usr/lib64/libcurl-gnutls-4.5.0
-#	/usr/lib/libcurl-gnutls-4.6.0
-#	/usr/lib64/libcurl-gnutls-4.6.0
-#"
-
-src_install(){
-	mkdir -p "${D}/usr/$(get_libdir)"
-	cp -r usr/lib/. "${D}/usr/$(get_libdir)"
-}

net-libs/libcurl-gnutls/libcurl-gnutls-7.73.0.ebuild

@@ -1,47 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-DESCRIPTION="libcurl libraries linked with gnutls"
-HOMEPAGE="https://curl.haxx.se"
-MIRROR_URI="https://mirror.rackspace.com/archlinux"
-SRC_URI="
-	amd64? (
-		${MIRROR_URI}/community/os/x86_64/${PN}-${PV}-1-x86_64.pkg.tar.zst
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror strip"
-
-COMMON_DEPEND="net-misc/curl[-curl_ssl_gnutls]"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zstd
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	net-libs/nghttp2
-	>=dev-libs/nettle-3.6
-"
-
-S="${WORKDIR}"
-
-#QA_PRESTRIPPED="
-#	/usr/lib/libcurl-gnutls-4.5.0
-#	/usr/lib64/libcurl-gnutls-4.5.0
-#	/usr/lib/libcurl-gnutls-4.6.0
-#	/usr/lib64/libcurl-gnutls-4.6.0
-#"
-
-src_install(){
-	mkdir -p "${D}/usr/$(get_libdir)"
-	cp -r usr/lib/. "${D}/usr/$(get_libdir)"
-}

net-libs/libcurl-gnutls/metadata.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>