*/*: Switch graphics proj packages to cmake.eclass

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

5 files changed, 17 insertions, 16 deletions

diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 0d2427edfda0..0a5c2ae4ad1a 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit cmake-multilib
-
+CMAKE_ECLASS=cmake
 MYP=RELEASE_${PV//./_}
+inherit cmake-multilib
 
 DESCRIPTION="C/C++ library for PDF generation"
 HOMEPAGE="http://www.libharu.org/"
@@ -36,5 +36,5 @@ multilib_src_configure() {
 		-DLIBHPDF_EXAMPLES=NO # Doesn't work
 		-DLIBHPDF_STATIC=NO
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
index 2371b0b89b5d..57630393fa94 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs
 
 DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
@@ -37,7 +38,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
 src_prepare() {
 	default
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	java-pkg-opt-2_src_prepare
 }
 
@@ -54,11 +55,11 @@ multilib_src_configure() {
 		-DWITH_MEM_SRCDST=ON
 	)
 	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if multilib_is_native_abi ; then
 		pushd "${WORKDIR}/debian/extra" &>/dev/null || die
@@ -68,7 +69,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if multilib_is_native_abi ; then
 		pushd "${WORKDIR}/debian/extra" &>/dev/null || die
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
index df5ac185621f..4b6cff224e4e 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
-inherit cmake-utils flag-o-matic python-single-r1
+inherit cmake flag-o-matic python-single-r1
 
 DESCRIPTION="A color management framework for visual effects and animation"
 HOMEPAGE="http://opencolorio.org/"
@@ -57,7 +57,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	use python && python_fix_shebang .
 }
@@ -84,8 +84,7 @@ src_configure() {
 		-DOCIO_BUILD_PYGLUE=$(usex python)
 		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
 		-DOCIO_BUILD_TESTS=$(usex test)
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON # They don't build
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
index 0ce713b21a93..300337e47296 100644
--- a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
@@ -81,7 +81,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	cmake_comment_add_subdirectory src/fonts
 }
 
@@ -121,5 +121,5 @@ src_configure() {
 		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index ff710267180c..28d53f909b25 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 # Make sure that test data are not newer than release;
@@ -41,7 +42,7 @@ src_prepare() {
 			die "Failed to rename test data"
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -53,7 +54,7 @@ multilib_src_configure() {
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {