Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/
Date: Sat, 18 Aug 2018 11:04:55
Message-Id: 1534590272.9791e971fed60aa414953c99b7ce85855cf8af5c.asturm@gentoo
1 commit: 9791e971fed60aa414953c99b7ce85855cf8af5c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 18 10:53:56 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 18 11:04:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9791e971
7
8 dev-util/apitrace: EAPI-6 bump, drop eutils
9
10 Add missing || die
11 local mycmakeargs
12
13 Package-Manager: Portage-2.3.47, Repoman-2.3.10
14
15 dev-util/apitrace/apitrace-7.1-r1.ebuild | 18 +++++++++---------
16 1 file changed, 9 insertions(+), 9 deletions(-)
17
18 diff --git a/dev-util/apitrace/apitrace-7.1-r1.ebuild b/dev-util/apitrace/apitrace-7.1-r1.ebuild
19 index 3d5b2b97d42..5392ad595d4 100644
20 --- a/dev-util/apitrace/apitrace-7.1-r1.ebuild
21 +++ b/dev-util/apitrace/apitrace-7.1-r1.ebuild
22 @@ -1,12 +1,12 @@
23 # Copyright 1999-2018 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25
26 -EAPI="5"
27 +EAPI=6
28
29 PYTHON_COMPAT=( python2_7 )
30 -inherit cmake-multilib eutils python-single-r1
31 +inherit cmake-multilib python-single-r1
32
33 -DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
34 +DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
35 HOMEPAGE="https://github.com/apitrace/apitrace"
36 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
37
38 @@ -59,15 +59,15 @@ src_prepare() {
39
40 src_configure() {
41 my_configure() {
42 - mycmakeargs=(
43 + local mycmakeargs=(
44 -DARCH_SUBDIR=
45 - $(cmake-utils_use_enable egl EGL)
46 - $(cmake-utils_use_enable !system-snappy STATIC_SNAPPY)
47 + -DENABLE_EGL=$(usex egl)
48 + -DENABLE_STATIC_SNAPPY=$(usex !system-snappy)
49 )
50 if multilib_is_native_abi ; then
51 mycmakeargs+=(
52 - $(cmake-utils_use_enable cli CLI)
53 - $(cmake-utils_use_enable qt5 GUI)
54 + -DENABLE_CLI=$(usex cli)
55 + -DENABLE_GUI=$(usex qt5)
56 )
57 else
58 mycmakeargs+=(
59 @@ -89,7 +89,7 @@ src_install() {
60 dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
61 dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
62
63 - rm docs/INSTALL.markdown
64 + rm docs/INSTALL.markdown || die
65 dodoc docs/* README.markdown
66
67 exeinto /usr/$(get_libdir)/${PN}/scripts