[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

["Andrew Savchenko" <bircoph@gentoo.org>]

commit:     c630935617aa5c55593b0d0497d83610bb5320d9
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 15:36:47 2020 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 15:40:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6309356

app-text/xpdf: migrate from cmake-utils to cmake eclass

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild b/app-text/xpdf/xpdf-4.02-r4.ebuild
index c8a43737864..288d1e75901 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="The PDF viewer and tools"
 HOMEPAGE="https://www.xpdfreader.com"
@@ -65,7 +65,8 @@ src_prepare() {
 		sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
 	fi
 
-	cmake-utils_src_prepare
+	xdg_environment_reset
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -80,11 +81,11 @@ src_configure() {
 		-DXPDFWIDGET_PRINTING=$(usex cups)
 		-DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use icons; then
 		# in some cases inkscape tries to write font cache to the
@@ -104,7 +105,7 @@ src_compile() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	domenu "${FILESDIR}/xpdf.desktop"
 	newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg