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 5BBBD138334 for ; Fri, 3 Jan 2020 19:40:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C5CAE097D; Fri, 3 Jan 2020 19:40:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 75C13E097D for ; Fri, 3 Jan 2020 19:40:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 EB63434DE88 for ; Fri, 3 Jan 2020 19:40:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75BC942 for ; Fri, 3 Jan 2020 19:40:32 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1578080423.e630067021daa4554261067cf3398a9a3d1fac1f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphite2/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/graphite2/graphite2-1.3.13.ebuild X-VCS-Directories: media-gfx/graphite2/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e630067021daa4554261067cf3398a9a3d1fac1f X-VCS-Branch: master Date: Fri, 3 Jan 2020 19:40:32 +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: e6e7d36e-5eca-4b1a-b226-73db0cad9512 X-Archives-Hash: 1c0ed4bb329865fa18af009cfad2cd06 commit: e630067021daa4554261067cf3398a9a3d1fac1f Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jan 3 19:39:59 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 3 19:40:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6300670 media-gfx/graphite2: Switch to cmake.eclass Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/graphite2/graphite2-1.3.13.ebuild | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild index afb99b3c7fe..a297b8ce652 100644 --- a/media-gfx/graphite2/graphite2-1.3.13.ebuild +++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) +CMAKE_ECLASS=cmake GENTOO_DEPEND_ON_PERL="no" inherit perl-module python-any-r1 cmake-multilib @@ -47,7 +48,7 @@ python_check_deps() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # make tests optional if ! use test; then @@ -65,11 +66,11 @@ multilib_src_configure() { -DGRAPHITE2_NSEGCACHE:BOOL=ON ) - cmake-utils_src_configure + cmake_src_configure # fix perl linking if multilib_is_native_abi && use perl; then - # we rely on the fact that cmake-utils_src_configure sets BUILD_DIR + # we rely on the fact that cmake_src_configure sets BUILD_DIR sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \ -i "${S}"/contrib/perl/Build.PL || die fi @@ -86,7 +87,7 @@ src_compile() { multilib_src_test() { if multilib_is_native_abi; then - cmake-utils_src_test + cmake_src_test else einfo "Cannot test since python is not multilib." fi