Merge branch 'opencolorio' into 'master'

Changes to opencolorio and new dependencies

See merge request src_prepare/src_prepare-overlay!164

dev-python/sphinx-tabs/Manifest

@@ -0,0 +1 @@
+DIST sphinx-tabs-2.1.0.tar.gz 519866 BLAKE2B d67f573a1394ac6ebe2e36b66e400c7704c2c0dc5136a52107915defa3efafed73898b444759b20d6ecc232e05423ed8d614c1ba32b416c80ab58be317f67b9f SHA512 7c9f7332422813d994af7e7023ebc63bef3819c73b09765d5af8c33d19990c649b049c6d6479ff6a763a868828ebe5510081a547aab7af1414966b555b1a45b5

dev-python/sphinx-tabs/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+</pkgmetadata>

dev-python/sphinx-tabs/sphinx-tabs-2.1.0.ebuild

@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Tabbed views for Sphinx"
+HOMEPAGE="https://sphinx-tabs.readthedocs.io"
+SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/refs/tags/v"${PV}".tar.gz -> "${P}".tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/sphinx-2.0.0
+	dev-python/pygments
+"

dev-python/sphinx_press_theme/Manifest

@@ -0,0 +1 @@
+DIST sphinx_press_theme-0.5.1.tar.gz 57582 BLAKE2B 46853599b0d5c9ba8a5f88320e3c96001c7181a3c90aef90353f9cbbc8dd3babf5068440ddd07226a283294411d693dd340e08174260f3e4fdafd004e85ae7fb SHA512 d1a2881a10d271972a54a9444d522aacd03d56d1c60448328429f6fc0cfbbf99642ef748297d6d5794d738822e1cd32a152ccb2d0a41bb0a8b562f34af672594

dev-python/sphinx_press_theme/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+</pkgmetadata>

dev-python/sphinx_press_theme/sphinx_press_theme-0.5.1.ebuild

@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="A Sphinx-doc theme based on Vuepress "
+HOMEPAGE="https://schettino72.github.io/sphinx_press_site/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/sphinx-2.0.0
+"

media-libs/opencolorio/files/opencolorio-2.0.0_libraries_to_lib64_instead_of_lib.patch

@@ -1,14 +0,0 @@
-diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt
-index 107e494e..e014ac31 100755
---- a/src/OpenColorIO/CMakeLists.txt
-+++ b/src/OpenColorIO/CMakeLists.txt
-@@ -287,7 +287,7 @@ if(MSVC AND BUILD_SHARED_LIBS)
- endif()
- 
- install(TARGETS OpenColorIO
--	LIBRARY DESTINATION lib
-+	LIBRARY DESTINATION lib64
- 	RUNTIME DESTINATION bin
--	ARCHIVE DESTINATION lib
-+	ARCHIVE DESTINATION lib64
- )

media-libs/opencolorio/opencolorio-2.0.0-r1.ebuild

@@ -0,0 +1,95 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit 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
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 doc opengl 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
+	opengl? (
+		>=media-libs/lcms-2.2
+		>=media-libs/openimageio-2.1.9:=
+	)
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-python/pybind11-2.4.3[${PYTHON_USEDEP}]
+		')
+	)
+"
+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}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+src_prepare() {
+	sed -i "s/DESTINATION lib/DESTINATION $(get_libdir)/" "${S}"/src/OpenColorIO/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_SUFFIX=""
+		-DBUILD_SHARED_LIBS=ON
+		-DOCIO_BUILD_APPS=$(usex opengl)
+		-DOCIO_BUILD_DOCS=$(usex doc)
+		-DOCIO_BUILD_PYTHON=$(usex python)
+		-DOCIO_BUILD_JAVA=OFF
+		-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.ebuild

@@ -1,88 +0,0 @@
-# Copyright 2021 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"${PV}".tar.gz -> "${P}".tar.gz
-	"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/OpenColorIO-"${PV}""
-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
-	)
-	media-libs/ilmbase
-"
-
-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-9999.ebuild

@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit cmake
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-single-r1 multilib cmake
 
 DESCRIPTION="A color management framework for visual effects and animation"
 HOMEPAGE="https://opencolorio.org/"
@@ -12,72 +14,77 @@ 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
+		https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v"${PV}".tar.gz -> "${P}".tar.gz
 	"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/OpenColorIO-"${MY_P}""
+	S="${WORKDIR}/OpenColorIO-"${PV}""
 fi
 
-# TODO
+#Missing:
-# doc, Python and Java bindings
+# Java bindings
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="cpu_flags_x86_sse2 opengl test"
+IUSE="cpu_flags_x86_sse2 doc opengl python test"
-#REQUIRED_USE="
+REQUIRED_USE="
-#	doc? ( python )
+	doc? ( python )
-#	python? ( ${PYTHON_REQUIRED_USE} )"
+	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
-	)
-	media-libs/ilmbase
 "
 
-DEPEND="${RDEPEND}"
+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
+	opengl? (
+		>=media-libs/lcms-2.2
+		>=media-libs/openimageio-2.1.9:=
+	)
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-python/pybind11-2.4.3[${PYTHON_USEDEP}]
+		')
+	)
+"
+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}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+"
 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=(
+src_prepare() {
-	"${FILESDIR}/opencolorio-2.0.0_libraries_to_lib64_instead_of_lib.patch"
+	sed -i "s/DESTINATION lib/DESTINATION $(get_libdir)/" "${S}"/src/OpenColorIO/CMakeLists.txt || die
-)
+	cmake_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(
+		-DLIB_SUFFIX=""
 		-DBUILD_SHARED_LIBS=ON
 		-DOCIO_BUILD_APPS=$(usex opengl)
-#		-DOCIO_BUILD_DOCS=$(usex doc)
+		-DOCIO_BUILD_DOCS=$(usex doc)
-#		-DOCIO_BUILD_PYTHON=$(usex python)
+		-DOCIO_BUILD_PYTHON=$(usex python)
+		-DOCIO_BUILD_JAVA=OFF
 		-DOCIO_BUILD_TESTS=$(usex test)
 		-DOCIO_BUILD_GPU_TESTS=$(usex test)
 		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)