Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wapiti/
Date: Sat, 02 Oct 2021 08:59:21
Message-Id: 1633165150.74aa2743ba44b7e29ae476eaef051a63890f6690.voyageur@gentoo
1 commit: 74aa2743ba44b7e29ae476eaef051a63890f6690
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 2 08:47:50 2021 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 2 08:59:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74aa2743
7
8 net-analyzer/wapiti: fix doc install path
9
10 Also remove DISTUTILS_USE_SETUPTOOLS
11
12 Closes: https://bugs.gentoo.org/800911
13 Closes: https://bugs.gentoo.org/808978
14 Package-Manager: Portage-3.0.26, Repoman-3.0.3
15 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
16
17 net-analyzer/wapiti/wapiti-3.0.5.ebuild | 2 +-
18 net-analyzer/wapiti/wapiti-9999.ebuild | 2 +-
19 2 files changed, 2 insertions(+), 2 deletions(-)
20
21 diff --git a/net-analyzer/wapiti/wapiti-3.0.5.ebuild b/net-analyzer/wapiti/wapiti-3.0.5.ebuild
22 index 348231badfe..d4ca3fb0a6d 100644
23 --- a/net-analyzer/wapiti/wapiti-3.0.5.ebuild
24 +++ b/net-analyzer/wapiti/wapiti-3.0.5.ebuild
25 @@ -3,7 +3,6 @@
26
27 EAPI=7
28
29 -DISTUTILS_USE_SETUPTOOLS=rdepend
30 PYTHON_COMPAT=( python3_{7..9} )
31 PYTHON_REQ_USE='xml'
32
33 @@ -38,6 +37,7 @@ S=${WORKDIR}/${MY_P}
34 python_prepare_all() {
35 sed -e 's/"pytest-runner"//' \
36 -e "/find_packages/s/()/(exclude=['tests*'])/" \
37 + -e "/DOC_DIR =/s/wapiti/${PF}/" \
38 -i setup.py || die
39 distutils-r1_python_prepare_all
40 }
41
42 diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
43 index 69ce960f21a..95c1263aa07 100644
44 --- a/net-analyzer/wapiti/wapiti-9999.ebuild
45 +++ b/net-analyzer/wapiti/wapiti-9999.ebuild
46 @@ -3,7 +3,6 @@
47
48 EAPI=7
49
50 -DISTUTILS_USE_SETUPTOOLS=rdepend
51 PYTHON_COMPAT=( python3_{7..9} )
52 PYTHON_REQ_USE='xml'
53
54 @@ -35,6 +34,7 @@ RESTRICT="test"
55 python_prepare_all() {
56 sed -e 's/"pytest-runner"//' \
57 -e "/find_packages/s/()/(exclude=['tests*'])/" \
58 + -e "/DOC_DIR =/s/wapiti/${PF}/" \
59 -i setup.py || die
60 distutils-r1_python_prepare_all
61 }