*/*: Switch games proj to cmake.eclass

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

6 files changed, 24 insertions, 26 deletions

diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
index 9e8d0f6b1289..a30e287caed4 100644
--- a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 MY_P=${PN}-src-${PV}
 
@@ -88,11 +88,11 @@ src_configure() {
 		# https://bugzilla.redhat.com/show_bug.cgi?id=1200193
 		-DCMAKE_SKIP_RPATH=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	doman man/${PN}.6
 }
 
diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
index 510a59e68be9..06ff63ec4324 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils user
+
+inherit cmake user
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -55,7 +56,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if ! use doc ; then
 		sed -i \
@@ -106,14 +107,13 @@ src_configure() {
 		-DENABLE_FRIBIDI="$(usex fribidi)"
 		-DENABLE_OMP="$(usex openmp)"
 		-DENABLE_STRICT_COMPILATION="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	local DOCS=( README.md changelog.md )
-	cmake-utils_src_install
+	cmake_src_install
 	if use dedicated || use server; then
 		rmdir "${ED}/run/wesnothd" || die
 		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
diff --git a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
index 807170165f0b..0451aedf6acf 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils user xdg
+inherit cmake user xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -50,7 +50,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if ! use doc ; then
 		sed -i \
@@ -100,14 +100,13 @@ src_configure() {
 		-DENABLE_NOTIFICATIONS="$(usex dbus)"
 		-DENABLE_FRIBIDI="$(usex fribidi)"
 		-DENABLE_STRICT_COMPILATION="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	local DOCS=( README.md changelog.md )
-	cmake-utils_src_install
+	cmake_src_install
 	if use dedicated || use server; then
 		rmdir "${ED}/run/wesnothd" || die
 		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
diff --git a/games-strategy/wesnoth/wesnoth-1.15.2.ebuild b/games-strategy/wesnoth/wesnoth-1.15.2.ebuild
index 807170165f0b..0451aedf6acf 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.2.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils user xdg
+inherit cmake user xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -50,7 +50,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if ! use doc ; then
 		sed -i \
@@ -100,14 +100,13 @@ src_configure() {
 		-DENABLE_NOTIFICATIONS="$(usex dbus)"
 		-DENABLE_FRIBIDI="$(usex fribidi)"
 		-DENABLE_STRICT_COMPILATION="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	local DOCS=( README.md changelog.md )
-	cmake-utils_src_install
+	cmake_src_install
 	if use dedicated || use server; then
 		rmdir "${ED}/run/wesnothd" || die
 		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
diff --git a/games-strategy/widelands/widelands-0.20.ebuild b/games-strategy/widelands/widelands-0.20.ebuild
index b1bdd2677338..2ccf31fe16eb 100644
--- a/games-strategy/widelands/widelands-0.20.ebuild
+++ b/games-strategy/widelands/widelands-0.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop cmake-utils
+inherit desktop cmake
 
 MY_PV="build$(ver_cut 2-)"
 MY_P="${PN}-${MY_PV/_/-}"
@@ -43,7 +43,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
 }
@@ -57,11 +57,11 @@ src_configure() {
 		# Game is NOT happy being moved from /usr/share/games
 		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# move game binary to correct location
 	dodir /usr/bin
diff --git a/games-strategy/widelands/widelands-0.20_rc1.ebuild b/games-strategy/widelands/widelands-0.20_rc1.ebuild
index 9cfddcf425f9..aaff95f0bbf1 100644
--- a/games-strategy/widelands/widelands-0.20_rc1.ebuild
+++ b/games-strategy/widelands/widelands-0.20_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop cmake-utils
+inherit desktop cmake
 
 MY_PV="build$(ver_cut 2-)"
 MY_P="${PN}-${MY_PV/_/-}"
@@ -43,7 +43,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
 }
@@ -57,11 +57,11 @@ src_configure() {
 		# Game is NOT happy being moved from /usr/share/games
 		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# move game binary to correct location
 	dodir /usr/bin