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 4E1941382C5 for ; Sun, 18 Apr 2021 15:20:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7ED69E07D8; Sun, 18 Apr 2021 15:19:59 +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 62886E07D8 for ; Sun, 18 Apr 2021 15:19:59 +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 2334C335D5D for ; Sun, 18 Apr 2021 15:19:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDA755C9 for ; Sun, 18 Apr 2021 15:19:56 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1618759174.13bde601e38ff110f6ddbb88cb1f7550b5e0bfbb.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meld/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/meld/meld-3.20.3.ebuild X-VCS-Directories: dev-util/meld/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 13bde601e38ff110f6ddbb88cb1f7550b5e0bfbb X-VCS-Branch: master Date: Sun, 18 Apr 2021 15:19:56 +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: 1b912ce6-c392-4b0b-81ae-69d5a51305d6 X-Archives-Hash: 259f0accc3e2d19f7eff65094aa69a61 commit: 13bde601e38ff110f6ddbb88cb1f7550b5e0bfbb Author: Matt Turner gentoo org> AuthorDate: Sun Apr 18 15:19:23 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Apr 18 15:19:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13bde601 dev-util/meld: BDEPEND on dev-python/distro Closes: https://bugs.gentoo.org/771690 Signed-off-by: Matt Turner gentoo.org> dev-util/meld/meld-3.20.3.ebuild | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dev-util/meld/meld-3.20.3.ebuild b/dev-util/meld/meld-3.20.3.ebuild index 93c774cbc35..a7542f75829 100644 --- a/dev-util/meld/meld-3.20.3.ebuild +++ b/dev-util/meld/meld-3.20.3.ebuild @@ -33,11 +33,16 @@ BDEPEND=" dev-util/intltool dev-util/itstool sys-devel/gettext + $(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]') " # dev-python/distro is soft-required in BDEPEND for python3.8 and onwards, # but it's mainly needed for debian and derivatives - seems the fallback # works fine, as we aren't a special_case, just an annoying warning. +python_check_deps() { + has_version -b "dev-python/distro[${PYTHON_USEDEP}]" +} + python_compile_all() { mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) }