commit: 65f587cba61d970bb72e086febe3edb50b175891 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Oct 27 11:13:56 2023 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Fri Oct 27 13:01:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f587cb
media-libs/openimageio: silence warnings Closes: https://bugs.gentoo.org/913746 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> media-libs/openimageio/openimageio-2.4.12.0.ebuild | 5 ++--- media-libs/openimageio/openimageio-2.4.13.0.ebuild | 5 ++--- media-libs/openimageio/openimageio-2.4.14.0.ebuild | 5 ++--- media-libs/openimageio/openimageio-2.4.15.0.ebuild | 5 ++--- media-libs/openimageio/openimageio-2.4.16.0.ebuild | 5 ++--- media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild | 1 + media-libs/openimageio/openimageio-2.5.4.0.ebuild | 5 ++--- 7 files changed, 13 insertions(+), 18 deletions(-) diff --git a/media-libs/openimageio/openimageio-2.4.12.0.ebuild b/media-libs/openimageio/openimageio-2.4.12.0.ebuild index c59fe4eab154..31c4f5904360 100644 --- a/media-libs/openimageio/openimageio-2.4.12.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.12.0.ebuild @@ -104,6 +104,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -154,9 +155,7 @@ src_configure() { if use qt5 || use qt6; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.13.0.ebuild b/media-libs/openimageio/openimageio-2.4.13.0.ebuild index 350883eff393..da733907b3ce 100644 --- a/media-libs/openimageio/openimageio-2.4.13.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.13.0.ebuild @@ -104,6 +104,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -158,9 +159,7 @@ src_configure() { if use qt5 || use qt6; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.14.0.ebuild b/media-libs/openimageio/openimageio-2.4.14.0.ebuild index 008c987ed88e..0de0832197fc 100644 --- a/media-libs/openimageio/openimageio-2.4.14.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.14.0.ebuild @@ -108,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -162,9 +163,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.15.0.ebuild b/media-libs/openimageio/openimageio-2.4.15.0.ebuild index 008c987ed88e..0de0832197fc 100644 --- a/media-libs/openimageio/openimageio-2.4.15.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.15.0.ebuild @@ -108,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -162,9 +163,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.16.0.ebuild b/media-libs/openimageio/openimageio-2.4.16.0.ebuild index 008c987ed88e..0de0832197fc 100644 --- a/media-libs/openimageio/openimageio-2.4.16.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.16.0.ebuild @@ -108,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -162,9 +163,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild index 09223e5d244c..79fdf5d96ef7 100644 --- a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild +++ b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild @@ -100,6 +100,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts diff --git a/media-libs/openimageio/openimageio-2.5.4.0.ebuild b/media-libs/openimageio/openimageio-2.5.4.0.ebuild index 008c987ed88e..0de0832197fc 100644 --- a/media-libs/openimageio/openimageio-2.5.4.0.ebuild +++ b/media-libs/openimageio/openimageio-2.5.4.0.ebuild @@ -108,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -162,9 +163,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else
