Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/khard/
Date: Sat, 31 Jul 2021 00:18:43
Message-Id: 1627690698.bc4566d10d430de662e75b1d8a102c8478b93d6e.sam@gentoo
1 commit: bc4566d10d430de662e75b1d8a102c8478b93d6e
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 31 00:04:40 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 31 00:18:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc4566d1
7
8 app-misc/khard: modernise Python ebuild
9
10 distutils_enable_tests handles IUSE/RESTRICT for us.
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 app-misc/khard/khard-0.13.0-r1.ebuild | 12 +-----------
15 app-misc/khard/khard-0.17.0-r1.ebuild | 8 +-------
16 2 files changed, 2 insertions(+), 18 deletions(-)
17
18 diff --git a/app-misc/khard/khard-0.13.0-r1.ebuild b/app-misc/khard/khard-0.13.0-r1.ebuild
19 index 06a157e5b7f..3606d1e02eb 100644
20 --- a/app-misc/khard/khard-0.13.0-r1.ebuild
21 +++ b/app-misc/khard/khard-0.13.0-r1.ebuild
22 @@ -12,8 +12,6 @@ HOMEPAGE="https://github.com/scheibler/khard"
23
24 LICENSE="GPL-3"
25 SLOT="0"
26 -IUSE="test"
27 -RESTRICT="!test? ( test )"
28
29 if [ "${PV}" == "9999" ]; then
30 inherit git-r3
31 @@ -30,21 +28,13 @@ RDEPEND="
32 dev-python/unidecode[${PYTHON_USEDEP}]
33 >dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
34 "
35 -BDEPEND="
36 - dev-python/setuptools[${PYTHON_USEDEP}]
37 - test? (
38 - ${RDEPEND}
39 - )
40 -"
41 # vobject-0.9.3 breaks khard, see
42 # https://github.com/scheibler/khard/issues/87
43 # https://github.com/eventable/vobject/issues/39
44
45 DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
46
47 -python_test() {
48 - esetup.py test
49 -}
50 +distutils_enable_tests setup.py
51
52 src_install() {
53 distutils-r1_src_install
54
55 diff --git a/app-misc/khard/khard-0.17.0-r1.ebuild b/app-misc/khard/khard-0.17.0-r1.ebuild
56 index 79c4e3cd1a7..10c6d6bcb52 100644
57 --- a/app-misc/khard/khard-0.17.0-r1.ebuild
58 +++ b/app-misc/khard/khard-0.17.0-r1.ebuild
59 @@ -12,8 +12,6 @@ HOMEPAGE="https://github.com/scheibler/khard"
60
61 LICENSE="GPL-3"
62 SLOT="0"
63 -IUSE="test"
64 -RESTRICT="!test? ( test )"
65
66 if [[ "${PV}" == *9999 ]]; then
67 inherit git-r3
68 @@ -32,18 +30,14 @@ RDEPEND="
69 dev-python/vobject[${PYTHON_USEDEP}]
70 "
71 BDEPEND="
72 - dev-python/setuptools[${PYTHON_USEDEP}]
73 test? (
74 - ${RDEPEND}
75 dev-python/setuptools_scm[${PYTHON_USEDEP}]
76 )
77 "
78
79 DOCS=( CHANGES CONTRIBUTING.rst README.md doc/source/examples/khard.conf.example )
80
81 -python_test() {
82 - esetup.py test
83 -}
84 +distutils_enable_tests setup.py
85
86 src_install() {
87 distutils-r1_src_install