From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1185152-garchives=archives.gentoo.org@lists.gentoo.org> 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 86074138359 for <garchives@archives.gentoo.org>; Mon, 6 Jul 2020 18:16:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BEE7E0938; Mon, 6 Jul 2020 18:16:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 81D44E0938 for <gentoo-commits@lists.gentoo.org>; Mon, 6 Jul 2020 18:16:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 7463F34F0E0 for <gentoo-commits@lists.gentoo.org>; Mon, 6 Jul 2020 18:16:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8205E2D6 for <gentoo-commits@lists.gentoo.org>; Mon, 6 Jul 2020 18:16:02 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> 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" <asturm@gentoo.org> Message-ID: <1594059325.1eca0ab57d32d3956301844e88a5d9c55485373a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrokdecode/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild X-VCS-Directories: sci-libs/libsigrokdecode/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1eca0ab57d32d3956301844e88a5d9c55485373a X-VCS-Branch: master Date: Mon, 6 Jul 2020 18:16:02 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cbaad449-d453-44d4-986c-16662001738f X-Archives-Hash: c14ea32fc12fda3147dcbd8624c25335 commit: 1eca0ab57d32d3956301844e88a5d9c55485373a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jul 2 23:35:35 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jul 6 18:15:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eca0ab5 sci-libs/libsigrokdecode: EAPI-7 bump, drop eutils, ltprune Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../libsigrokdecode/libsigrokdecode-0.5.3.ebuild | 26 ++++++++++++---------- .../libsigrokdecode/libsigrokdecode-9999.ebuild | 26 ++++++++++++---------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild index 1b1d6710e99..987d7b1a748 100644 --- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild +++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild @@ -1,13 +1,12 @@ # 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 python-single-r1 -inherit eutils ltprune python-single-r1 - -if [[ ${PV} == "9999" ]]; then +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" inherit git-r3 autotools else @@ -15,7 +14,7 @@ else KEYWORDS="~amd64 ~x86" fi -DESCRIPTION="provide (streaming) protocol decoding functionality" +DESCRIPTION="Provide (streaming) protocol decoding functionality" HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode" LICENSE="GPL-3" @@ -23,13 +22,16 @@ SLOT="0/4" IUSE="static-libs" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND=">=dev-libs/glib-2.34.0 - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND="${PYTHON_DEPS} + >=dev-libs/glib-2.34.0 +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" src_prepare() { - [[ ${PV} == "9999" ]] && eautoreconf + default # Only a test program (not installed, and not used by src_test) # is used by libsigrok, so disable it to avoid the compile. @@ -37,7 +39,7 @@ src_prepare() { -e '/build_runtc=/s:yes:no:' \ configure || die - eapply_user + [[ ${PV} == *9999* ]] && eautoreconf } src_configure() { @@ -50,5 +52,5 @@ src_test() { src_install() { default - prune_libtool_files + find "${D}" -name '*.la' -type f -delete || die } diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild index d4b8425482e..aa68dd79a09 100644 --- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild +++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild @@ -1,13 +1,12 @@ # 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 python-single-r1 -inherit eutils ltprune python-single-r1 - -if [[ ${PV} == "9999" ]]; then +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" inherit git-r3 autotools else @@ -15,7 +14,7 @@ else KEYWORDS="~amd64 ~x86" fi -DESCRIPTION="provide (streaming) protocol decoding functionality" +DESCRIPTION="Provide (streaming) protocol decoding functionality" HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode" LICENSE="GPL-3" @@ -23,13 +22,16 @@ SLOT="0/9999" IUSE="static-libs" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND=">=dev-libs/glib-2.34.0 - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND="${PYTHON_DEPS} + >=dev-libs/glib-2.34.0 +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" src_prepare() { - [[ ${PV} == "9999" ]] && eautoreconf + default # Only a test program (not installed, and not used by src_test) # is used by libsigrok, so disable it to avoid the compile. @@ -37,7 +39,7 @@ src_prepare() { -e '/build_runtc=/s:yes:no:' \ configure || die - eapply_user + [[ ${PV} == *9999* ]] && eautoreconf } src_configure() { @@ -50,5 +52,5 @@ src_test() { src_install() { default - prune_libtool_files + find "${D}" -name '*.la' -type f -delete || die }