[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/

[Andrew Savchenko]

commit:     a3c965d37acea5479b08abcbeb0bc05d1aa0a0a2
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 15:27:25 2021 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 15:30:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3c965d3

net-proxy/privoxy: enable mbedtls by default

In order to avoid REQUIRED_USE conflict on default Linux profile
mbedtls is enabled as default ssl implementation, but both mbedtls
and openssl are ignored if ssl support is disabled.

Closes: https://bugs.gentoo.org/764248
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/privoxy/privoxy-3.0.29.ebuild | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/net-proxy/privoxy/privoxy-3.0.29.ebuild b/net-proxy/privoxy/privoxy-3.0.29.ebuild
index 6d4bcb7581c..fffcbe231db 100644
--- a/net-proxy/privoxy/privoxy-3.0.29.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.29.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
 
 IUSE="+acl brotli client-tags compression editor extended-host-patterns
 extended-statistics external-filters +fast-redirects +force fuzz
-graceful-termination +image-blocking ipv6 lfs mbedtls openssl
+graceful-termination +image-blocking ipv6 lfs +mbedtls openssl
 png-images selinux ssl +stats +threads toggle tools whitelists
 +zlib"
 SLOT="0"
@@ -27,8 +27,10 @@ DEPEND="
 	acct-user/privoxy
 	dev-libs/libpcre
 	brotli? ( app-arch/brotli )
-	mbedtls? ( net-libs/mbedtls )
-	openssl? ( dev-libs/openssl )
+	ssl? (
+		mbedtls? ( net-libs/mbedtls )
+		openssl? ( dev-libs/openssl )
+	)
 	zlib? ( sys-libs/zlib )
 "
 RDEPEND="${DEPEND}
@@ -46,8 +48,6 @@ REQUIRED_USE="
 	brotli? ( zlib )
 	fuzz? ( zlib )
 	ssl? ( ^^ ( mbedtls openssl ) )
-	mbedtls? ( ssl )
-	openssl? ( ssl )
 "
 
 S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
@@ -79,6 +79,11 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf="--without-mbedtls --without-openssl"
+	if use ssl; then
+		myconf="$(use_with mbedtls) $(use_with openssl)"
+	fi
+
 	# --with-debug only enables debug CFLAGS
 	# --with-docbook and --with-db2html and their deps are useless,
 	#	since docs are already pregenerated in the source tarball
@@ -108,8 +113,7 @@ src_configure() {
 		$(use_enable whitelists trust-files) \
 		$(use_enable zlib) \
 		$(use_with brotli) \
-		$(use_with mbedtls) \
-		$(use_with openssl)
+		${myconf}
 }
 
 src_install() {