Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meld/
Date: Sun, 18 Apr 2021 15:20:00
Message-Id: 1618759174.13bde601e38ff110f6ddbb88cb1f7550b5e0bfbb.mattst88@gentoo
1 commit: 13bde601e38ff110f6ddbb88cb1f7550b5e0bfbb
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 18 15:19:23 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 18 15:19:34 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13bde601
7
8 dev-util/meld: BDEPEND on dev-python/distro
9
10 Closes: https://bugs.gentoo.org/771690
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 dev-util/meld/meld-3.20.3.ebuild | 5 +++++
14 1 file changed, 5 insertions(+)
15
16 diff --git a/dev-util/meld/meld-3.20.3.ebuild b/dev-util/meld/meld-3.20.3.ebuild
17 index 93c774cbc35..a7542f75829 100644
18 --- a/dev-util/meld/meld-3.20.3.ebuild
19 +++ b/dev-util/meld/meld-3.20.3.ebuild
20 @@ -33,11 +33,16 @@ BDEPEND="
21 dev-util/intltool
22 dev-util/itstool
23 sys-devel/gettext
24 + $(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
25 "
26 # dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
27 # but it's mainly needed for debian and derivatives - seems the fallback
28 # works fine, as we aren't a special_case, just an annoying warning.
29
30 +python_check_deps() {
31 + has_version -b "dev-python/distro[${PYTHON_USEDEP}]"
32 +}
33 +
34 python_compile_all() {
35 mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
36 }