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 607E5138359 for ; Mon, 6 Jul 2020 18:16:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACEA9E0946; Mon, 6 Jul 2020 18:16:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 97344E0946 for ; Mon, 6 Jul 2020 18:16:07 +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 A586434F0E0 for ; Mon, 6 Jul 2020 18:16:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB15E2DB for ; Mon, 6 Jul 2020 18:16:02 +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: <1594059325.f97cf58b9f21dd5955964fadee9c1592bebf5d28.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/pulseview/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/pulseview/pulseview-9999.ebuild X-VCS-Directories: sci-electronics/pulseview/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f97cf58b9f21dd5955964fadee9c1592bebf5d28 X-VCS-Branch: master Date: Mon, 6 Jul 2020 18:16:02 +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: e2e4ed5e-9ac5-47f6-8cfc-0a81edc21b9f X-Archives-Hash: 21d5a1dbc251518b6574297c26bda891 commit: f97cf58b9f21dd5955964fadee9c1592bebf5d28 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jul 2 22:33:08 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jul 6 18:15:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97cf58b sci-electronics/pulseview: EAPI-7 bump, use cmake.eclass Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-electronics/pulseview/pulseview-9999.ebuild | 31 ++++++++++++++----------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild index 570474071f0..58e35968ffd 100644 --- a/sci-electronics/pulseview/pulseview-9999.ebuild +++ b/sci-electronics/pulseview/pulseview-9999.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) -inherit cmake-utils gnome2-utils python-single-r1 xdg-utils +inherit cmake python-single-r1 xdg-utils -if [[ ${PV} == "9999" ]]; then +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" inherit git-r3 else @@ -23,21 +23,24 @@ SLOT="0" IUSE="+decode static" REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND=" +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/boost-1.55:= >=dev-libs/glib-2.28.0:2 - >=dev-cpp/glibmm-2.28.0:2 - >=sci-libs/libsigrok-0.6.0:=[cxx] dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-qt/qtwidgets:5 dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + >=sci-libs/libsigrok-0.6.0:=[cxx] decode? ( - >=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}] ${PYTHON_DEPS} - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" + >=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}] + ) +" +RDEPEND="${DEPEND}" DOCS=( HACKING NEWS README ) @@ -47,15 +50,15 @@ src_configure() { -DENABLE_DECODE=$(usex decode) -DSTATIC_PKGDEPS_LIBS=$(usex static) ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update xdg_desktop_database_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update xdg_desktop_database_update }