Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphite2/
Date: Fri, 03 Jan 2020 19:40:36
Message-Id: 1578080423.e630067021daa4554261067cf3398a9a3d1fac1f.asturm@gentoo
1 commit: e630067021daa4554261067cf3398a9a3d1fac1f
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 3 19:39:59 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 3 19:40:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6300670
7
8 media-gfx/graphite2: Switch to cmake.eclass
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-gfx/graphite2/graphite2-1.3.13.ebuild | 11 ++++++-----
14 1 file changed, 6 insertions(+), 5 deletions(-)
15
16 diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
17 index afb99b3c7fe..a297b8ce652 100644
18 --- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
19 +++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild
20 @@ -1,10 +1,11 @@
21 -# Copyright 1999-2019 Gentoo Authors
22 +# Copyright 1999-2020 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26
27 PYTHON_COMPAT=( python3_{6,7} )
28
29 +CMAKE_ECLASS=cmake
30 GENTOO_DEPEND_ON_PERL="no"
31 inherit perl-module python-any-r1 cmake-multilib
32
33 @@ -47,7 +48,7 @@ python_check_deps() {
34 }
35
36 src_prepare() {
37 - cmake-utils_src_prepare
38 + cmake_src_prepare
39
40 # make tests optional
41 if ! use test; then
42 @@ -65,11 +66,11 @@ multilib_src_configure() {
43 -DGRAPHITE2_NSEGCACHE:BOOL=ON
44 )
45
46 - cmake-utils_src_configure
47 + cmake_src_configure
48
49 # fix perl linking
50 if multilib_is_native_abi && use perl; then
51 - # we rely on the fact that cmake-utils_src_configure sets BUILD_DIR
52 + # we rely on the fact that cmake_src_configure sets BUILD_DIR
53 sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
54 -i "${S}"/contrib/perl/Build.PL || die
55 fi
56 @@ -86,7 +87,7 @@ src_compile() {
57
58 multilib_src_test() {
59 if multilib_is_native_abi; then
60 - cmake-utils_src_test
61 + cmake_src_test
62 else
63 einfo "Cannot test since python is not multilib."
64 fi