From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6BFD138359 for ; Sat, 19 Sep 2020 15:40:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6EDFE05C1; Sat, 19 Sep 2020 15:40:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A92AFE05C1 for ; Sat, 19 Sep 2020 15:40:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 530F9340EA7 for ; Sat, 19 Sep 2020 15:40:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B389BEC for ; Sat, 19 Sep 2020 15:40:55 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1600530037.c630935617aa5c55593b0d0497d83610bb5320d9.bircoph@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/xpdf/xpdf-4.02-r4.ebuild X-VCS-Directories: app-text/xpdf/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: c630935617aa5c55593b0d0497d83610bb5320d9 X-VCS-Branch: master Date: Sat, 19 Sep 2020 15:40:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 69caac05-7c16-483b-91a3-622df5badf39 X-Archives-Hash: 8eafe03c73b853d2d63f43e9a9863660 commit: c630935617aa5c55593b0d0497d83610bb5320d9 Author: Andrew Savchenko gentoo org> AuthorDate: Sat Sep 19 15:36:47 2020 +0000 Commit: Andrew Savchenko gentoo 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 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