gentoo resync : 29.12.2022

6 files changed, 40 insertions, 204 deletions

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index d2f191e5678c..12d277ca398d 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,13 +1,11 @@
-DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0240b88beeae216c6e39f450cb860660b2c844393a759302dfd325ba95336e06944ad72acfb0e87aa2b1cadfe658bd6bdaa SHA512 22a61e8b1ca098c2293e972372d02f0ac8ce54b46eb957b1ffcacb9e0ca4ff13f560d67804e0db0a898d8bec2fdb73f3cdcd1ee1867f92f97f84c1c111e535be
-DIST openimageio-2.2.19.0.tar.gz 29252399 BLAKE2B f90b330944885271e117a01235a48f11e88960f5825d0c84e6e2c994479e76a26bf90e66afec4aae6a5c7164510963027bef79fe0265676ce0993235824d461d SHA512 63951d958daaa4bc62fc210efaeced51affd207be21c938ecd5da70217060bb9c8197bf95813e2fddb728a641e69d2889f9445b7d16653a110e45adf3cb86541
 DIST openimageio-2.3.12.0.tar.gz 32452689 BLAKE2B f5fd428c597b573586a4749b56225ad3c035ab1c2122ff3e93df8e90be5796cc57978aa9fc5b102f2cf64d2407e70a11683b5bbee118c9fac3536b965ed044cc SHA512 c8ec0ead8396717b218d937b9193ef9162c68446f6f1d477f3f0ee4b5656c3d7d53b58bf55aa300fbf57d367a47d795861b5683157e0d0271e0ea56f0460c58d
 DIST openimageio-2.3.13.0.tar.gz 32456755 BLAKE2B 897a7db0eabb9a7cc29ab8fea368c32fc70b63b5ecebbcfa8d1fffe55c2435d9638f8a1f69069c45fad3723a2b7dc40e83971f48892afc631a7593a7629fb92a SHA512 fbefa341a11fd502ec9313ca48a0fe433c5822699e4934f6a14089f670314cbe1c9c0b9a491b1d1927bda0223e38a62192c6ddeec6c4c5e6215a8b3fb6900dd8
 DIST openimageio-2.3.15.0.tar.gz 32626322 BLAKE2B 1367e40dbed3d43b53db1b7117c563782396b255e366ea9586438a5c81cb8ae96ff42a0e445c7932bc92dc327adae921b383c2e6d787dc6e67cf71946d6174c1 SHA512 8ed0303fd9314e01cbf6d45627eb6e88e3fd356387a7657a4b31bbe455a4a493f88a2b511c1d5cf86a9c00346dbc03f9b32d2a6df9da033e7e78e86142ce888c
+DIST openimageio-2.3.16.0.tar.gz 32632560 BLAKE2B bde9d46b74135f03215cc3741c0378580dc34381da041b3d06ff50154627edd69b93e1a714bc99c7800fe952300f752cb9d8ca62b042ec91569dbbc9bc10950f SHA512 2249dfc7f9c4ede563d5ed05ed76557e0b81c35054832b4de2a7820c8619886afa3f260cd26b5f4291f74c9d9c16b9a2ac3772e23b5b70bc87c2c7a0d0c10726
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
 DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
-EBUILD openimageio-2.2.18.0-r1.ebuild 4192 BLAKE2B 00a910784e52d4d50a2920641278b41a53847963d9cc0d31badea2e3a3497242f3af9fe6acec43efce043f7acd724ac8f30f475d7697cdfd73b0f39a59e09fcd SHA512 ba24aa74cbe44ab72f8f33397d0d29409d90b8c0263d4551970cb8e35bae4f28fb975414cddf35cb777597c671a8474e81f4b3157194f9c60b3df9bff265a4f8
-EBUILD openimageio-2.2.19.0.ebuild 4205 BLAKE2B ef7cdd667669625a80665df60a203498603704ebdfd8b55eb9f7d4a81dbd62e94401d3e89c086d72f44ee8b82930d89714fdce4a9362925200627220df08365c SHA512 19ed3037b747b83a11ba5bb26f286545db12cb4eda9ac94ce3803f77b45ea37f87f6aa38deea87cf0ae6c955b7dcd34f13881e884254a6ae048111a2b3d5107d
 EBUILD openimageio-2.3.12.0-r3.ebuild 4640 BLAKE2B 7eeca5be1bd3c8e1fc81bf0fd1116aa5448df61d8cacab682a68472171e430c3cc9e1e30640972a927f76770954b5d2491abcde1a1b552bce4695d177971386f SHA512 0bf5d25e8a636a7c1a670d4481d46258f1ed3b6bb33ad64f5203bb0d0f32abf75ab35870f54311b5c4285ef87c383ce88747806269d7659646ff97fa6ea5bd0e
-EBUILD openimageio-2.3.13.0.ebuild 4642 BLAKE2B 74fa8fee521c7fc17e340b5c3932d3a119fb39a76e908a5d48654650651940f0cce2a7cdbe406da51c57e631301d105df4da59fb9c62765f0758abc6fa6eeee5 SHA512 901764f59f9482769688c5bd5fb1a18592197c6cee09889a88dd190206cd84a0028d40355fd8e46e16953ab4e055ed4ff834734283ade41c2354bafb51e2ab5a
-EBUILD openimageio-2.3.15.0.ebuild 4654 BLAKE2B 8686c7931471c93232a81551d477a1db6dce6c0f12439eb23c9f8c39c97186f5688d7744730276b420c163a33f61a2816227077eb2eb18544e3fc7eedb2620d4 SHA512 475e831ad4c82683d31b092734d9fd21e32b35731379598dc82c6b4b2d3029ad7bba36fb5e6f910fa3aa350c5d57c3e8efe2baabd11613523922be3430df937c
-MISC metadata.xml 820 BLAKE2B fd092484e492bc042f5cfdbb717963a12596a00514f986cddccd5b8956891c95b996ac1f5831ab2314f0ee3fbe3fa1905e7601a7b017a9a91f2f7c1aba3a9d8f SHA512 5dfc9f4ab3300f94c611822d1b1badb785cfaeab90bdadf5db5e36d1eb6eff8851123470a1863e1a137f94ea4ce286d2b67f6c3a28cb18d65bb177e1d570b7b4
+EBUILD openimageio-2.3.13.0.ebuild 4654 BLAKE2B e9fad8d19fcabccb3cb318696fa65a9f4018559f323c31636bca4a82624a29ec08d709a3fd6e9f9b70329651f193649e66fc3bbf8f7c9450d784802aaea4c78f SHA512 76a527fa0e3c7b2978541129eb39b9c04f3a63e8b6cca448c34d277c29bb1146e309e1f30c6f70c0c8ca4ce477a33266beab8f9f6aeef7d6276daa7b7f255172
+EBUILD openimageio-2.3.15.0.ebuild 4652 BLAKE2B cbf5df67b5fc6461693c77758d5a2ded83a30973266f2bc5aa950f1c889a03510a6466ed4b9e67be01a8c46f52a7bd0867644613434bdaceaff8d8e76ff00080 SHA512 9ed6872bd72942c69981c30bce64019f7da0bcbad2aa7472426b93373837d0172d7f73cbcdf0fa0adcb38171eee470913f426a79c3740a3e06eb4bc62866428d
+EBUILD openimageio-2.3.16.0.ebuild 4654 BLAKE2B cebafc4a779e0e2d1ee40acfb3ada29440398f517183642fe720f1b4df169a6adcbb54aab92ea21658cc269cfb8f67647a6e37854abf2781d411e10c7bbe61d1 SHA512 0b7b997693bd9a2369cd9f2caec0f8ca4bfe76fd9a1f51f70ce059aa16a08ec0296c05bf175d5a27ca5e71f5748652cd2a98db0fbaab6a085fe8158f60e0b3d7
+MISC metadata.xml 724 BLAKE2B 057b0c63428b1860a3b11442b9687b136a749935e3d0bb2e27eca00245d1d9e6f3e40aa796b723664b9b320d8c958a345812199ed04f8d1a476364a80c76e355 SHA512 5243cd4cac10b569e1488226b61c98012af13f50e32c023176e6a2ba29f7804e164b4774957b35f212bad62f496bb466b242d6bc1be44ca3ea0909371b9d5415
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 82c6c1129ce1..d3e2ace8309b 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<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>
diff --git a/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild
deleted file mode 100644
index 0aa03a21997a..000000000000
--- a/media-libs/openimageio/openimageio-2.2.18.0-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake font 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/2.2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-X86_CPU_FEATURES=(
-	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="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-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:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib: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_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Note: on bumps, please try again with OpenEXR 3 + ilmmath!
-	# Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
-	# (because it mix and matches which version it uses; sed this to
-	# make sure it'll use OpenEXR 3 if it can, but it won't.)
-	# bug #821193
-	sed -i \
-		-e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
-		src/cmake/modules/FindOpenEXR.cmake || die
-
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-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_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-	if use python; then
-		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.3.13.0.ebuild b/media-libs/openimageio/openimageio-2.3.13.0.ebuild
index 53d4cadea1db..b8193ccaa6f2 100644
--- a/media-libs/openimageio/openimageio-2.3.13.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.13.0.ebuild
@@ -59,8 +59,8 @@ RDEPEND="
 	>=media-libs/opencolorio-2.1.1-r4:=
 	>=media-libs/openexr-3:0=
 	media-libs/tiff:0=
+	media-libs/libjpeg-turbo:=
 	sys-libs/zlib:=
-	virtual/jpeg:0
 	dicom? ( sci-libs/dcmtk )
 	ffmpeg? ( media-video/ffmpeg:= )
 	gif? ( media-libs/giflib:0= )
diff --git a/media-libs/openimageio/openimageio-2.3.15.0.ebuild b/media-libs/openimageio/openimageio-2.3.15.0.ebuild
index 01a5f74fd9da..69bb079738c0 100644
--- a/media-libs/openimageio/openimageio-2.3.15.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.15.0.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD"
 # TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
 # for changing to openexr 3 which broke ABI.
 SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/openimageio/openimageio-2.2.19.0.ebuild b/media-libs/openimageio/openimageio-2.3.16.0.ebuild
index c19e648e4dec..347165ba2e87 100644
--- a/media-libs/openimageio/openimageio-2.2.19.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.16.0.ebuild
@@ -1,20 +1,29 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 FONT_PN=OpenImageIO
 PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
 inherit cmake font 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}"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+	)"
+S="${WORKDIR}/oiio-${PV}"
 
 LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
+# for changing to openexr 3 which broke ABI.
+SLOT="0/$(ver_cut 1-2).1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
@@ -22,12 +31,11 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
+# Not quite working yet
+RESTRICT="!test? ( test ) test"
 
 BDEPEND="
 	doc? (
@@ -44,18 +52,17 @@ RDEPEND="
 	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/libjpeg-turbo:=
 	media-libs/libpng:0=
 	>=media-libs/libwebp-0.2.1:=
-	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:0=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
-	virtual/jpeg:0
 	dicom? ( sci-libs/dcmtk )
 	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
 	gif? ( media-libs/giflib:0= )
 	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
 	opencv? ( media-libs/opencv:= )
@@ -95,17 +102,14 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Note: on bumps, please try again with OpenEXR 3 + ilmmath!
-	# Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
-	# (because it mix and matches which version it uses; sed this to
-	# make sure it'll use OpenEXR 3 if it can, but it won't.)
-	# bug #821193
-	sed -i \
-		-e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
-		src/cmake/modules/FindOpenEXR.cmake || die
-
 	cmake_src_prepare
 	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
 }
 
 src_configure() {
@@ -121,7 +125,8 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
 		-DINSTALL_FONTS=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DINSTALL_DOCS=$(usex doc)
@@ -132,7 +137,6 @@ src_configure() {
 		-DUSE_JPEGTURBO=ON
 		-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)
@@ -146,7 +150,10 @@ src_configure() {
 		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
 	if use python; then
-		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
+		mycmakeargs+=(
+			-DPYTHON_VERSION=${EPYTHON#python}
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
 	fi
 
 	cmake_src_configure