[gentoo-commits] repo/gentoo:master commit in: dev-games/cegui/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     e33b1a2227adfa1108f335e97f02a08c273f916e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 20:32:03 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May 16 20:43:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e33b1a22

dev-games/cegui: EAPI 7 and cmake.eclass

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-games/cegui/cegui-0.8.7-r1.ebuild | 56 +++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/dev-games/cegui/cegui-0.8.7-r1.ebuild b/dev-games/cegui/cegui-0.8.7-r1.ebuild
index a9349feec0c..50f748ed23b 100644
--- a/dev-games/cegui/cegui-0.8.7-r1.ebuild
+++ b/dev-games/cegui/cegui-0.8.7-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 # TODO: multiple ABI?
 PYTHON_COMPAT=( python3_8 )
-inherit eutils flag-o-matic cmake-utils python-single-r1
+inherit flag-o-matic cmake python-single-r1
 
 DESCRIPTION="Crazy Eddie's GUI System"
 HOMEPAGE="http://www.cegui.org.uk/"
@@ -52,11 +52,15 @@ RDEPEND="
 	xerces-c? ( dev-libs/xerces-c )
 	xml? ( dev-libs/libxml2 )
 	zip? ( sys-libs/zlib[minizip] )"
+
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	opengl? ( media-libs/glm )"
+
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
-	opengl? ( media-libs/glm )"
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-icu-59.patch
@@ -74,46 +78,46 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DCEGUI_BUILD_IMAGECODEC_CORONA=OFF
-		$(cmake-utils_use devil CEGUI_BUILD_IMAGECODEC_DEVIL)
-		$(cmake-utils_use freeimage CEGUI_BUILD_IMAGECODEC_FREEIMAGE)
+		-DCEGUI_BUILD_IMAGECODEC_DEVIL=$(usex devil)
+		-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=$(usex freeimage)
 		-DCEGUI_BUILD_IMAGECODEC_PVR=OFF
 		-DCEGUI_BUILD_IMAGECODEC_SILLY=OFF
 		-DCEGUI_BUILD_IMAGECODEC_STB=ON
 		-DCEGUI_BUILD_IMAGECODEC_TGA=ON
-		$(cmake-utils_use lua CEGUI_BUILD_LUA_GENERATOR)
-		$(cmake-utils_use lua CEGUI_BUILD_LUA_MODULE)
-		$(cmake-utils_use python CEGUI_BUILD_PYTHON_MODULES)
+		-DCEGUI_BUILD_LUA_GENERATOR=$(usex lua)
+		-DCEGUI_BUILD_LUA_MODULE=$(usex lua)
+		-DCEGUI_BUILD_PYTHON_MODULES=$(usex python)
 		-DCEGUI_BUILD_RENDERER_DIRECTFB=OFF
-		$(cmake-utils_use irrlicht CEGUI_BUILD_RENDERER_IRRLICHT)
+		-DCEGUI_BUILD_RENDERER_IRRLICHT=$(usex irrlicht)
 		-DCEGUI_BUILD_RENDERER_NULL=ON
-		$(cmake-utils_use ogre CEGUI_BUILD_RENDERER_OGRE)
-		$(cmake-utils_use opengl CEGUI_BUILD_RENDERER_OPENGL)
-		$(cmake-utils_use opengl CEGUI_BUILD_RENDERER_OPENGL3)
+		-DCEGUI_BUILD_RENDERER_OGRE=$(usex ogre)
+		-DCEGUI_BUILD_RENDERER_OPENGL=$(usex opengl)
+		-DCEGUI_BUILD_RENDERER_OPENGL3=$(usex opengl)
 		-DCEGUI_BUILD_RENDERER_OPENGLES=OFF
-		$(cmake-utils_use static-libs CEGUI_BUILD_STATIC_CONFIGURATION)
+		-DCEGUI_BUILD_STATIC_CONFIGURATION=$(usex static-libs)
 		-DCEGUI_BUILD_TESTS=OFF
-		$(cmake-utils_use expat CEGUI_BUILD_XMLPARSER_EXPAT)
-		$(cmake-utils_use xml CEGUI_BUILD_XMLPARSER_LIBXML2)
+		-DCEGUI_BUILD_XMLPARSER_EXPAT=$(usex expat)
+		-DCEGUI_BUILD_XMLPARSER_LIBXML2=$(usex xml)
 		-DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
-		$(cmake-utils_use tinyxml CEGUI_BUILD_XMLPARSER_TINYXML)
-		$(cmake-utils_use xerces-c CEGUI_BUILD_XMLPARSER_XERCES)
-		$(cmake-utils_use truetype CEGUI_HAS_FREETYPE)
-		$(cmake-utils_use zip CEGUI_HAS_MINIZIP_RESOURCE_PROVIDER)
-		$(cmake-utils_use pcre CEGUI_HAS_PCRE_REGEX)
+		-DCEGUI_BUILD_XMLPARSER_TINYXML=$(usex tinyxml)
+		-DCEGUI_BUILD_XMLPARSER_XERCES=$(usex xerces-c)
+		-DCEGUI_HAS_FREETYPE=$(usex truetype)
+		-DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=$(usex zip)
+		-DCEGUI_HAS_PCRE_REGEX=$(usex pcre)
 		-DCEGUI_SAMPLES_ENABLED=OFF
-		$(cmake-utils_use bidi CEGUI_USE_FRIBIDI)
+		-DCEGUI_USE_FRIBIDI=$(usex bidi)
 		-DCEGUI_USE_MINIBIDI=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && emake -C "${BUILD_DIR}" html
+	cmake_src_compile all $(usex doc html "")
 }
 
 src_install() {
-	cmake-utils_src_install
-	use doc && dohtml "${BUILD_DIR}"/doc/doxygen/html/*
+	cmake_src_install
+	docinto html
+	use doc && dodoc -r "${BUILD_DIR}"/doc/doxygen/html/*
 }