Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/
Date: Sun, 26 Jan 2020 18:02:41
Message-Id: 1580061628.fb8422391bb91a27a37c1373a9cf78729df258cd.leio@gentoo
1 commit: fb8422391bb91a27a37c1373a9cf78729df258cd
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 26 16:33:22 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 26 18:00:28 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb842239
7
8 dev-util/devhelp: add py3.7 support, use python_gen_cond_dep
9
10 Closes: https://bugs.gentoo.org/702438
11 Package-Manager: Portage-2.3.84, Repoman-2.3.20
12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
13
14 dev-util/devhelp/devhelp-3.30.1.ebuild | 11 ++++++-----
15 1 file changed, 6 insertions(+), 5 deletions(-)
16
17 diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild b/dev-util/devhelp/devhelp-3.30.1.ebuild
18 index e00885f4d8e..014be70449d 100644
19 --- a/dev-util/devhelp/devhelp-3.30.1.ebuild
20 +++ b/dev-util/devhelp/devhelp-3.30.1.ebuild
21 @@ -2,9 +2,7 @@
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=6
25 -# gedit-3.8 is python3 only, this also per:
26 -# https://bugzilla.redhat.com/show_bug.cgi?id=979450
27 -PYTHON_COMPAT=( python3_6 )
28 +PYTHON_COMPAT=( python3_{6,7} )
29
30 inherit gnome.org gnome2-utils meson python-single-r1 xdg
31
32 @@ -28,8 +26,11 @@ COMMON_DEPEND="
33 RDEPEND="${COMMON_DEPEND}
34 gedit? (
35 ${PYTHON_DEPS}
36 - app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
37 - dev-python/pygobject:3[${PYTHON_USEDEP}] )
38 + $(python_gen_cond_dep '
39 + app-editors/gedit[introspection,python,${PYTHON_SINGLE_USEDEP}]
40 + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
41 + ')
42 + )
43 "
44 # libxml2 required for glib-compile-resources
45 DEPEND="${COMMON_DEPEND}