[gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/

["Sam James" <sam@gentoo.org>]

commit:     3c0c49b302a9951deb742ad1ffaebcdd04e33ca0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 08:30:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 08:30:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c0c49b3

www-servers/lighttpd: drop crypto-* flags for now

This reverts commit 3f1aad3dcf145d7d7b6a877c157db123f4de26b3 for now,
pending anyone requesting the functionality.

The crypto-* flags allow specifying the default implementation but
users can do this via configuration or, if needed, MYMESONARGS if they
want a smaller binary. Let's see what the feedback is.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/lighttpd/lighttpd-9999.ebuild | 34 +++----------------------------
 www-servers/lighttpd/metadata.xml         |  4 ----
 2 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild
index e53ed82ab8c5..95a95e50e4a8 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-9999.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-IUSE="+brotli crypto-gnutls crypto-mbedtls crypto-nettle crypto-openssl dbi gnutls kerberos ldap libdeflate +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd"
+IUSE="+brotli dbi gnutls kerberos ldap libdeflate +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -36,10 +36,6 @@ COMMON_DEPEND="
 	>=dev-libs/xxhash-0.8.2
 	virtual/libcrypt:=
 	brotli? ( app-arch/brotli:= )
-	crypto-gnutls? ( net-libs/gnutls )
-	crypto-mbedtls? ( net-libs/mbedtls )
-	crypto-nettle? ( dev-libs/nettle:= )
-	crypto-openssl? ( >=dev-libs/openssl-0.9.7:= )
 	dbi? (
 		dev-db/libdbi
 	)
@@ -111,32 +107,8 @@ pkg_setup() {
 }
 
 src_configure() {
-
-	local c_defs
-	local with_nettle
-
-	# choose crypto library
-	# (one specific library might be preferred on embedded systems via
+	# (One specific library might be preferred on embedded systems via
 	#  MYMESONARGS with e.g. -DFORCE_blah_CRYPTO)
-	if use crypto-nettle ; then
-		with_nettle=$(meson_use crypto-nettle with_nettle)
-	elif use nettle ; then
-		with_nettle=$(meson_use nettle with_nettle)
-	else
-		if use crypto-mbedtls ; then
-			c_defs+=-DFORCE_MBEDTLS_CRYPTO
-		elif use crypto-openssl ; then
-			c_defs+=-DFORCE_OPENSSL_CRYPTO
-		elif use crypto-gnutls ; then
-			c_defs+=-DFORCE_GNUTLS_CRYPTO
-		fi
-	fi
-
-	local c_args
-	if c_defs ; then
-		c_args=-Dc_args=\"${c_defs[0]}\"
-	fi
-
 	local emesonargs=(
 		-Dmoduledir="$(get_libdir)"/${PN}
 
@@ -166,7 +138,7 @@ src_configure() {
 		$(meson_feature maxminddb with_maxminddb)
 		$(meson_use mbedtls with_mbedtls)
 
-		${with_nettle}
+		$(meson_use nettle with_nettle)
 		$(meson_use nss with_nss)
 
 		# Obsolete

diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml
index 02655cc07024..9e9e76560d95 100644
--- a/www-servers/lighttpd/metadata.xml
+++ b/www-servers/lighttpd/metadata.xml
@@ -15,10 +15,6 @@
 	</longdescription>
 	<use>
 		<flag name="brotli">Enable output compression via <pkg>app-arch/brotli</pkg> (recommended)</flag>
-		<flag name="crypto-gnutls">Use <pkg>net-libs/gnutls</pkg> as crypto library</flag>
-		<flag name="crypto-mbedtls">Use <pkg>net-libs/mbedtls</pkg> as crypto library</flag>
-		<flag name="crypto-nettle">Use <pkg>dev-libs/nettle</pkg> as crypto library</flag>
-		<flag name="crypto-openssl">Use <pkg>dev-libs/openssl</pkg> as crypto library</flag>
 		<flag name="gnutls">Build module for TLS via <pkg>net-libs/gnutls</pkg></flag>
 		<flag name="libdeflate">Enable output compression via <pkg>app-arch/libdeflate</pkg></flag>
 		<flag name="maxminddb">Add support for geolocation using <pkg>dev-libs/libmaxminddb</pkg></flag>