1 |
commit: 62baf9140884a7191bce2b6eb2f48947bbbde195 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 30 14:41:35 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 30 15:53:12 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62baf914 |
7 |
|
8 |
gnome-base/libgnome-keyring: fix python-any-r1 eclass usage |
9 |
|
10 |
Closes: https://bugs.gentoo.org/708574 |
11 |
Closes: https://bugs.gentoo.org/720128 |
12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
13 |
|
14 |
.../libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild | 13 ++++++++++++- |
15 |
1 file changed, 12 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild |
18 |
index f8384173ee0..30c0398c00e 100644 |
19 |
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild |
20 |
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild |
21 |
@@ -32,12 +32,23 @@ DEPEND="${RDEPEND} |
22 |
>=dev-util/intltool-0.35 |
23 |
sys-devel/gettext |
24 |
virtual/pkgconfig |
25 |
- test? ( $(python_gen_any_dep ' |
26 |
+ test? ( ${PYTHON_DEPS} $(python_gen_any_dep ' |
27 |
dev-python/pygobject:2[${PYTHON_USEDEP}] |
28 |
dev-python/dbus-python[${PYTHON_USEDEP}]') ) |
29 |
vala? ( $(vala_depend) ) |
30 |
" |
31 |
|
32 |
+python_check_deps() { |
33 |
+ if use test; then |
34 |
+ has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" && |
35 |
+ has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" |
36 |
+ fi |
37 |
+} |
38 |
+ |
39 |
+pkg_setup() { |
40 |
+ use test && python-any-r1_pkg_setup |
41 |
+} |
42 |
+ |
43 |
src_prepare() { |
44 |
epatch "${FILESDIR}"/${PV}-vala-0.42-compat.patch |
45 |
use vala && vala_src_prepare |