gentoo resync : 25.11.2020

4 files changed, 61 insertions, 28 deletions

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index bc6cc034bbcc..8dedb352c584 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,4 +1,5 @@
 AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6
-DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
-EBUILD openimageio-1.8.17-r2.ebuild 3303 BLAKE2B 36740a48bf14c437d92bdf5882e63353c60745fd3f3677c5398569af267749644ca2423ee42b5f4e4b0e17dc63774e68372e0f47b0b992fd777128b8d91787cd SHA512 911a1f992f1f298e4d496834b1c20f8db8779a02681d572b992a27f7d32b4a8860fc304e2f7e6d893479402fdd799b9c81465d6f3984b541d8a219f386944c99
-MISC metadata.xml 748 BLAKE2B e89aa731461192e01b368333a0832a106ced96d7a6d6dc1aa749e6c8658e28f654e9f4901946fa547d5ffca5c10364277814850d9b9936f5831d86bfa418cca7 SHA512 3ff7883072966c763052d32c6fff17732ccc551e9cddfa4548c1613a08bdc93644f16c1e8e8f88a3ecbe7a10b21a0a920517094ff13e40003adc97ecc0936bec
+AUX openimageio-2.2.6.1-pugixml.patch 919 BLAKE2B 3f10cf27a3a521fed3b95183119da62333f3103998ad463c58b9e654ce23faedb0551a34d564899882d586411035bb0531c844425fa639f6def8bba9c10afe6a SHA512 fc834e27b2b166367d9aa2b4016bac70de1561ff6babfd543a6bd503785bd84a251b76a95bf15dbc76367e9482dc4589f208f57a537c2dc430c7e0999cd98bcf
+DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
+EBUILD openimageio-2.2.8.0.ebuild 3333 BLAKE2B 89179cf97ee4ecea05dcd854485c4eebd47c1b4efe42f8296d5d7afc9960ce6acc720affffb80a498df8ba20a63ba76b3963e89a34cff151191c72dd3214f6d3 SHA512 eed484e60fa85a4ecf7f4553f25459f24909e46f60fd97e21bbbedfbeec50bcd3787716ed05e05f5de9663b22b13376a2d08bf11b0c5bf57db35c7db49efb332
+MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
diff --git a/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
new file mode 100644
index 000000000000..d5cef06d38db
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
@@ -0,0 +1,21 @@
+https://github.com/OpenImageIO/oiio/issues/2732
+
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index 1240f22..5cc5a2e 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -227,6 +227,14 @@ endif ()
+ # allow this to be overridden to use the distro-provided package if desired.
+ option (USE_EXTERNAL_PUGIXML "Use an externally built shared library version of the pugixml library" OFF)
+ if (USE_EXTERNAL_PUGIXML)
++    find_path (PUGIXML_INCLUDE_DIR NAMES pugixml.hpp)
++    find_library (PUGIXML_LIBRARIES NAMES pugixml)
++
++    set (PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR})
++    set (PUGIXML_INCLUDE_DIRS ${PUGIXML_INCLUDE_DIR})
++    set (PUGIXML_LIBRARIES ${PUGIXML_LIBRARIES})
++    set (PUGIXML_INCLUDES ${PUGIXML_INCLUDE_DIR})
++
+     checked_find_package (pugixml REQUIRED
+                           DEFINITIONS -DUSE_EXTERNAL_PUGIXML=1)
+ endif()
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 4593e8d4cbff..dbbc1a37515e 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<use>
-		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
 		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
 		<flag name="field3d">Enable f3d file (write) support via <pkg>media-libs/Field3D</pkg></flag>
 		<flag name="opencv">Enable OpenCV support via <pkg>media-libs/opencv</pkg></flag>
+		<flag name="openvdb">Enable OpenVDB support via <pkg>media-gfx/openvdb</pkg></flag>
 		<flag name="ptex">Enable Ptex texture mapping system file support via <pkg>media-libs/ptex</pkg></flag>
 	</use>
 	<upstream>
diff --git a/media-libs/openimageio/openimageio-1.8.17-r2.ebuild b/media-libs/openimageio/openimageio-2.2.8.0.ebuild
index e0e7eafa62ad..934cf38bd1c8 100644
--- a/media-libs/openimageio/openimageio-1.8.17-r2.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.8.0.ebuild
@@ -3,27 +3,30 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit cmake python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
 SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/2.2"
 KEYWORDS="amd64 ~ppc64 x86"
 
 X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
 	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="color-management dicom doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RESTRICT="test" # bug 431412
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
 
 BDEPEND="
 	doc? (
@@ -37,31 +40,40 @@ BDEPEND="
 "
 RDEPEND="
 	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
 	dev-libs/pugixml:=
 	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
 	media-libs/libpng:0=
 	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
 	>=media-libs/openexr-2.2.0-r2:=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
 	virtual/jpeg:0
-	color-management? ( media-libs/opencolorio:= )
 	dicom? ( sci-libs/dcmtk )
 	ffmpeg? ( media-video/ffmpeg:= )
 	field3d? ( media-libs/Field3D:= )
 	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
 	opencv? ( media-libs/opencv:= )
 	opengl? (
 		media-libs/glew:=
 		virtual/glu
 		virtual/opengl
 	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
 	ptex? ( media-libs/ptex:= )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_MULTI_USEDEP}]
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
 		')
 	)
 	qt5? (
@@ -71,19 +83,11 @@ RDEPEND="
 		opengl? ( dev-qt/qtopengl:5 )
 	)
 	raw? ( media-libs/libraw:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
 	truetype? ( media-libs/freetype:2= )
 "
 DEPEND="${RDEPEND}"
 
-DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
-
-PATCHES=( "${FILESDIR}/${P}-boostpython.patch" )
-
-S="${WORKDIR}/oiio-Release-${PV}"
+DOCS=( CHANGES.md CREDITS.md README.md )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -106,26 +110,26 @@ src_configure() {
 	[[ -z ${mysimd} ]] && mysimd=("0")
 
 	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DBUILD_DOCS=$(usex doc)
 		-DINSTALL_DOCS=$(usex doc)
-		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
 		-DSTOP_ON_WARNING=OFF
+		-DUSE_DCMTK=$(usex dicom)
 		-DUSE_EXTERNAL_PUGIXML=ON
 		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=NO # Missing in Gentoo
-		-DUSE_NUKE=OFF
-		-DUSE_OCIO=$(usex color-management)
-		-DUSE_DICOM=$(usex dicom)
+		-DUSE_NUKE=OFF # not in Gentoo
 		-DUSE_FFMPEG=$(usex ffmpeg)
 		-DUSE_FIELD3D=$(usex field3d)
 		-DUSE_GIF=$(usex gif)
 		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_OPENCV=$(usex opencv)
 		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
 		-DUSE_PTEX=$(usex ptex)
 		-DUSE_PYTHON=$(usex python)
 		-DUSE_QT=$(usex qt5)
 		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_OPENSSL=$(usex ssl)
 		-DUSE_FREETYPE=$(usex truetype)
 		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)