media-libs/openimageio: drop deprecated qt4 support and add libressl dependency.

Qt4 is now deprecated, so remove it.
Add libressl support to v1.7.17.

Closes: https://bugs.gentoo.org/644520
Closes: https://bugs.gentoo.org/644638

diff --git a/media-libs/openimageio/openimageio-1.6.13.ebuild b/media-libs/openimageio/openimageio-1.6.13.ebuild
index d1f065679aeed8759550376fb2c7cac228905113..f7a101f8a20c8e662a68340170516c383da5ca80 100644 (file)
--- a/media-libs/openimageio/openimageio-1.6.13.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE="colorio ffmpeg gif jpeg2k opencv opengl python qt4 raw ssl +truetype"
+IUSE="colorio ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -45,12 +45,6 @@ RDEPEND="
                ${PYTHON_DEPS}
                dev-libs/boost:=[python,${PYTHON_USEDEP}]
        )
-       qt4? (
-               dev-qt/qtcore:4
-               dev-qt/qtgui:4
-               dev-qt/qtopengl:4
-               media-libs/glew:=
-       )
        raw? ( media-libs/libraw:= )
        ssl? ( dev-libs/openssl:0 )
        truetype? ( media-libs/freetype:2= )"
@@ -91,7 +85,7 @@ src_configure() {
                -DUSE_OPENSSL=$(usex ssl)
                -DUSE_PYTHON=$(usex python)
                -DUSE_LIBRAW=$(usex raw)
-               -DUSE_QT=$(usex qt4)
+               -DUSE_QT=OFF # Deprecated
        )
 
        if [[ ${EPYTHON} == python3* ]]; then

diff --git a/media-libs/openimageio/openimageio-1.6.18.ebuild b/media-libs/openimageio/openimageio-1.6.18.ebuild
index 874a927f7b8d9a163a84d81d7531c663a4db8003..7f5f2086dbf8074d35bda6d405b7f67593cf2bfd 100644 (file)
--- a/media-libs/openimageio/openimageio-1.6.18.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.18.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -30,7 +30,7 @@ RDEPEND="dev-libs/boost:=
        media-libs/openexr:=
        media-libs/tiff:0=
        sys-libs/zlib:=
-       virtual/jpeg:=
+       virtual/jpeg:0
        colorio? ( media-libs/opencolorio:0= )
        ffmpeg? ( media-video/ffmpeg:0= )
        field3d? ( media-libs/Field3D )
@@ -46,12 +46,6 @@ RDEPEND="dev-libs/boost:=
                ${PYTHON_DEPS}
                dev-libs/boost:=[python,${PYTHON_USEDEP}]
        )
-       qt4? (
-               dev-qt/qtcore:4
-               dev-qt/qtgui:4
-               dev-qt/qtopengl:4
-               media-libs/glew:=
-       )
        raw? ( media-libs/libraw:0= )
        ssl? ( dev-libs/openssl:0= )
        truetype? ( media-libs/freetype:2= )"
@@ -101,8 +95,8 @@ src_configure() {
                -DUSE_OPENSSL=$(usex ssl)
                -DUSE_PTEX=$(usex ptex)
                -DUSE_PYTHON=$(usex python)
-               -DUSE_QT=$(usex qt4)
-               -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+               -DUSE_QT=OFF # Deprecated
+               -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
        )
 
        cmake-utils_src_configure

diff --git a/media-libs/openimageio/openimageio-1.7.17.ebuild b/media-libs/openimageio/openimageio-1.7.17.ebuild
index 20a3d95420387e7c9efda446e13f55157a51300c..163f0a64e7631b443a2d6448fbeace3c150ba1b1 100644 (file)
--- a/media-libs/openimageio/openimageio-1.7.17.ebuild
+++ b/media-libs/openimageio/openimageio-1.7.17.ebuild
@@ -20,7 +20,7 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -33,7 +33,7 @@ RDEPEND=">=dev-libs/boost-1.62:=
        >=media-libs/openexr-2.2.0-r2:=
        media-libs/tiff:0=
        sys-libs/zlib:=
-       virtual/jpeg:=
+       virtual/jpeg:0
        colorio? ( media-libs/opencolorio:= )
        ffmpeg? ( media-video/ffmpeg:= )
        field3d? ( media-libs/Field3D:= )
@@ -49,14 +49,11 @@ RDEPEND=">=dev-libs/boost-1.62:=
                ${PYTHON_DEPS}
                dev-libs/boost:=[python,${PYTHON_USEDEP}]
        )
-       qt4? (
-               dev-qt/qtcore:4
-               dev-qt/qtgui:4
-               dev-qt/qtopengl:4
-               media-libs/glew:=
-       )
        raw? ( media-libs/libraw:= )
-       ssl? ( dev-libs/openssl:0= )
+       ssl? (
+               !libressl? ( dev-libs/openssl:0= )
+               libressl? ( dev-libs/libressl:0= )
+       )
        truetype? ( media-libs/freetype:2= )"
 DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen[latex] )"
@@ -105,8 +102,8 @@ src_configure() {
                -DUSE_OPENSSL=$(usex ssl)
                -DUSE_PTEX=$(usex ptex)
                -DUSE_PYTHON=$(usex python)
-               -DUSE_QT=$(usex qt4)
-               -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+               -DUSE_QT=OFF # Deprecated
+               -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
        )
 
        cmake-utils_src_configure