Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/freeradius/
Date: Wed, 12 Feb 2020 00:26:00
Message-Id: 1581467140.f7f755690f196dc3aa10a4a83f9a7f3bd0e739a3.mattst88@gentoo
1 commit: f7f755690f196dc3aa10a4a83f9a7f3bd0e739a3
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 12 00:16:04 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 12 00:25:40 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f75569
7
8 net-dialup/freeradius: Apply patches earlier
9
10 src_prepare() selectively deletes subdirectories depending on USE flags
11 since configure.ac does not offer configurable switches. If a patch
12 applies changes to a directory that may be deleted, then src_prepare()
13 can fail depending on the USE flags that are set. This was the case with
14 USE=-python.
15
16 Avoid this possibility by applying patches before deleting directories.
17
18 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
19
20 net-dialup/freeradius/freeradius-3.0.20.ebuild | 3 +--
21 1 file changed, 1 insertion(+), 2 deletions(-)
22
23 diff --git a/net-dialup/freeradius/freeradius-3.0.20.ebuild b/net-dialup/freeradius/freeradius-3.0.20.ebuild
24 index 533b388bf6c..5d43f28c636 100644
25 --- a/net-dialup/freeradius/freeradius-3.0.20.ebuild
26 +++ b/net-dialup/freeradius/freeradius-3.0.20.ebuild
27 @@ -90,6 +90,7 @@ src_prepare() {
28 # not interested in using.
29
30 eapply_user
31 + default
32
33 use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
34 use ldap || { rm -r src/modules/rlm_ldap || die ; }
35 @@ -158,8 +159,6 @@ src_prepare() {
36 usesqldriver sqlite
37 usesqldriver mongodb mongo
38
39 - default
40 -
41 eautoreconf
42 }