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

Signed-off-by: Andreas Sturmlechner <[email protected]>
johu · Dec 31, 2019 · d7500b6 · d7500b6
1 parent c403905
commit d7500b6
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 96 deletions.
diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
 
 DOC_PV="2.6.0"
 MY_PV="${PV/_/}"
@@ -86,7 +86,7 @@ pkg_pretend() {
 src_prepare() {
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -109,11 +109,11 @@ src_configure() {
 		-DUSE_WEBP=$(usex webp)
 	)
 	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
 	if use nls ; then

diff --git a/media-gfx/darktable/darktable-2.6.3.ebuild b/media-gfx/darktable/darktable-2.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
 
 DOC_PV="2.6.0"
 MY_PV="${PV/_/}"
@@ -84,7 +84,7 @@ pkg_pretend() {
 src_prepare() {
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -107,11 +107,11 @@ src_configure() {
 		-DUSE_WEBP=$(usex webp)
 	)
 	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
 	if use nls ; then

diff --git a/media-gfx/darktable/darktable-3.0.0.ebuild b/media-gfx/darktable/darktable-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
 
 DOC_PV="2.6.0"
 MY_PV="${PV/_/}"
@@ -84,7 +84,7 @@ pkg_pretend() {
 src_prepare() {
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -107,11 +107,11 @@ src_configure() {
 		-DUSE_WEBP=$(usex webp)
 	)
 	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
 	if use nls ; then

diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic git-r3 pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic git-r3 pax-utils toolchain-funcs xdg
 
 EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
 
@@ -73,7 +73,7 @@ pkg_pretend() {
 src_prepare() {
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -96,11 +96,11 @@ src_configure() {
 		-DUSE_WEBP=$(usex webp)
 	)
 	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
 	if use nls ; then

diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Image Blending with Multiresolution Splines"
 HOMEPAGE="http://enblend.sourceforge.net/"
@@ -52,7 +52,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
 }
@@ -70,7 +70,7 @@ src_configure() {
 		-DINSTALL_PDF_DOC=ON
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
@@ -81,5 +81,5 @@ src_compile() {
 	export VARTEXFONTS="${T}/fonts"
 
 	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	cmake-utils_src_compile -j1
+	cmake_src_compile -j1
 }
diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
@@ -4,9 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
+inherit cmake bash-completion-r1
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
@@ -81,14 +79,14 @@ pkg_pretend() {
 
 src_prepare() {
 	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
 	if use gimp || use krita || use qt5; then
 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
 		local S="${S}/gmic-qt"
 		PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
-		cmake-utils_src_prepare
+		cmake_src_prepare
 	fi
 }
 
@@ -115,7 +113,7 @@ src_configure() {
 		-DENABLE_DYNAMIC_LINKING=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	# configure gmic-qt frontends
 	local CMAKE_USE_DIR="${S}/gmic-qt"
@@ -128,32 +126,32 @@ src_configure() {
 
 	if use gimp; then
 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
 	fi
 
 	if use krita; then
 		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
 	fi
 
 	if use qt5; then
 		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
 	fi
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc README
 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
 

diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild
@@ -4,9 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
+inherit cmake bash-completion-r1
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
@@ -81,14 +79,14 @@ pkg_pretend() {
 
 src_prepare() {
 	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
 	if use gimp || use krita || use qt5; then
 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
 		local S="${S}/gmic-qt"
 		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
-		cmake-utils_src_prepare
+		cmake_src_prepare
 	fi
 }
 
@@ -115,7 +113,7 @@ src_configure() {
 		-DENABLE_DYNAMIC_LINKING=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	# configure gmic-qt frontends
 	local CMAKE_USE_DIR="${S}/gmic-qt"
@@ -128,32 +126,32 @@ src_configure() {
 
 	if use gimp; then
 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
 	fi
 
 	if use krita; then
 		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
 	fi
 
 	if use qt5; then
 		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
 	fi
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc README
 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
 

diff --git a/media-gfx/gmic/gmic-2.7.2.ebuild b/media-gfx/gmic/gmic-2.7.2.ebuild
@@ -4,9 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
+inherit cmake bash-completion-r1
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
@@ -81,14 +79,14 @@ pkg_pretend() {
 
 src_prepare() {
 	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
 	if use gimp || use krita || use qt5; then
 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
 		local S="${S}/gmic-qt"
 		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
-		cmake-utils_src_prepare
+		cmake_src_prepare
 	fi
 }
 
@@ -115,7 +113,7 @@ src_configure() {
 		-DENABLE_DYNAMIC_LINKING=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	# configure gmic-qt frontends
 	local CMAKE_USE_DIR="${S}/gmic-qt"
@@ -128,32 +126,32 @@ src_configure() {
 
 	if use gimp; then
 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
 	fi
 
 	if use krita; then
 		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
 	fi
 
 	if use qt5; then
 		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
 	fi
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc README
 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}