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 35904138335 for ; Sat, 18 Aug 2018 11:04:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4163BE086C; Sat, 18 Aug 2018 11:04:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 114BEE086E for ; Sat, 18 Aug 2018 11:04:53 +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 75460340688 for ; Sat, 18 Aug 2018 11:04:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D768D3AC for ; Sat, 18 Aug 2018 11:04:45 +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: <1534590272.9791e971fed60aa414953c99b7ce85855cf8af5c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/apitrace/apitrace-7.1-r1.ebuild X-VCS-Directories: dev-util/apitrace/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9791e971fed60aa414953c99b7ce85855cf8af5c X-VCS-Branch: master Date: Sat, 18 Aug 2018 11:04:45 +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-Archives-Salt: 36ba36b6-b9e8-4973-b170-89929b5a51d4 X-Archives-Hash: d9f55bbc926b3cd503316eff737ba8e7 commit: 9791e971fed60aa414953c99b7ce85855cf8af5c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 18 10:53:56 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 18 11:04:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9791e971 dev-util/apitrace: EAPI-6 bump, drop eutils Add missing || die local mycmakeargs Package-Manager: Portage-2.3.47, Repoman-2.3.10 dev-util/apitrace/apitrace-7.1-r1.ebuild | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-util/apitrace/apitrace-7.1-r1.ebuild b/dev-util/apitrace/apitrace-7.1-r1.ebuild index 3d5b2b97d42..5392ad595d4 100644 --- a/dev-util/apitrace/apitrace-7.1-r1.ebuild +++ b/dev-util/apitrace/apitrace-7.1-r1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit cmake-multilib eutils python-single-r1 +inherit cmake-multilib python-single-r1 -DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs" +DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs" HOMEPAGE="https://github.com/apitrace/apitrace" SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -59,15 +59,15 @@ src_prepare() { src_configure() { my_configure() { - mycmakeargs=( + local mycmakeargs=( -DARCH_SUBDIR= - $(cmake-utils_use_enable egl EGL) - $(cmake-utils_use_enable !system-snappy STATIC_SNAPPY) + -DENABLE_EGL=$(usex egl) + -DENABLE_STATIC_SNAPPY=$(usex !system-snappy) ) if multilib_is_native_abi ; then mycmakeargs+=( - $(cmake-utils_use_enable cli CLI) - $(cmake-utils_use_enable qt5 GUI) + -DENABLE_CLI=$(usex cli) + -DENABLE_GUI=$(usex qt5) ) else mycmakeargs+=( @@ -89,7 +89,7 @@ src_install() { dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 - rm docs/INSTALL.markdown + rm docs/INSTALL.markdown || die dodoc docs/* README.markdown exeinto /usr/$(get_libdir)/${PN}/scripts