From: Matt Turner <mattst88@gentoo.org>
Date: Wed, 12 Feb 2020 00:16:04 +0000 (-0800)
Subject: net-dialup/freeradius: Apply patches earlier
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7f755690f196dc3aa10a4a83f9a7f3bd0e739a3;p=gentoo.git

net-dialup/freeradius: Apply patches earlier

src_prepare() selectively deletes subdirectories depending on USE flags
since configure.ac does not offer configurable switches. If a patch
applies changes to a directory that may be deleted, then src_prepare()
can fail depending on the USE flags that are set. This was the case with
USE=-python.

Avoid this possibility by applying patches before deleting directories.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---

diff --git a/net-dialup/freeradius/freeradius-3.0.20.ebuild b/net-dialup/freeradius/freeradius-3.0.20.ebuild
index 533b388bf6c2..5d43f28c636d 100644
--- a/net-dialup/freeradius/freeradius-3.0.20.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.20.ebuild
@@ -90,6 +90,7 @@ src_prepare() {
 	# not interested in using.
 
 	eapply_user
+	default
 
 	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
 	use ldap || { rm -r src/modules/rlm_ldap || die ; }
@@ -158,8 +159,6 @@ src_prepare() {
 	usesqldriver sqlite
 	usesqldriver mongodb mongo
 
-	default
-
 	eautoreconf
 }