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 47FAC139360 for ; Mon, 9 Aug 2021 00:22:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93632E0921; Mon, 9 Aug 2021 00:22: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 74558E0921 for ; Mon, 9 Aug 2021 00:22: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 F3FBD33BE07 for ; Mon, 9 Aug 2021 00:22:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B13384C for ; Mon, 9 Aug 2021 00:22:50 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1628462743.b90be910ff90c7e6650b9f6e211303feff5791c4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/usbutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/usbutils/usbutils-014.ebuild X-VCS-Directories: sys-apps/usbutils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b90be910ff90c7e6650b9f6e211303feff5791c4 X-VCS-Branch: master Date: Mon, 9 Aug 2021 00:22:50 +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: 514c3644-7ed3-4e85-acdd-a29abb0a236c X-Archives-Hash: 1a4569ce309607ef4896ceb9bb11a129 commit: b90be910ff90c7e6650b9f6e211303feff5791c4 Author: Sam James gentoo org> AuthorDate: Sun Aug 8 22:45:36 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Aug 8 22:45:43 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b90be910 sys-apps/usbutils: disable py3.7, fix BDEPEND, missing die - Drop Python 3.7 (it's a noop, support is gone from the eclass) - We need Python as a BDEPEND if USE=python too - Add missing die Signed-off-by: Sam James gentoo.org> sys-apps/usbutils/usbutils-014.ebuild | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys-apps/usbutils/usbutils-014.ebuild b/sys-apps/usbutils/usbutils-014.ebuild index c92094e848b..14581fea76a 100644 --- a/sys-apps/usbutils/usbutils-014.ebuild +++ b/sys-apps/usbutils/usbutils-014.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9} ) inherit autotools python-single-r1 @@ -21,7 +21,8 @@ DEPEND="virtual/libusb:1= virtual/libudev:=" BDEPEND=" app-arch/xz-utils - virtual/pkgconfig" + virtual/pkgconfig + python? ( ${PYTHON_DEPS} )" RDEPEND="${DEPEND} sys-apps/hwids python? ( ${PYTHON_DEPS} )" @@ -49,5 +50,7 @@ src_install() { newdoc usbhid-dump/NEWS NEWS.usbhid-dump dobin usbreset # noinst_PROGRAMS, but installed by other distros - use python || rm -f "${ED}"/usr/bin/lsusb.py + if ! use python ; then + rm -f "${ED}"/usr/bin/lsusb.py || die + fi }