gentoo auto-resync : 21:02:2024 - 11:40:26

3 files changed, 5 insertions, 27 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index ef13f4b79bdd..0e1dce8cd3c1 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index f802f6a526d1..12befc8701e1 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -7,10 +7,10 @@ AUX lighttpd.initd-r1 1993 BLAKE2B 719a854c4faad43a7d33303afd68950ec5393b63f485c
 AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc7a3078464cf2cb7eec982f626201cc0d0aea7dd7de81cacf603f6d064c8ec6f8dcff09f78dfd48b656aa93 SHA512 8cae2d3acb2f4d9a9043e492c4b15024f85f92d93616d5e92e08d51e2295fde6160c750be08244703f999208c4b43ecfb9a2fcb8e223e52992551a0668302ffe
 AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469ab074469ba0b670f56b147c8088ad9211f97a4f314fe4eaebac89cd9cddee34edbf3652b7ea0712c94 SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f
 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
-DIST lighttpd-1.4.72.tar.xz 1083676 BLAKE2B 5cc50d9ff1988b1ec7b6332850ba6fed66cf894c81b1a670f7d78136b4761290e0402c962f31f20aa795582a42cac74a851ba67bda57412136861b0ff7b76b33 SHA512 5becb57915e3548a1b9b980014be22b3c08dcf0e9be524f9cd0093886aaf6d00b20986e8b1fb10ecdbdffd8e42dd18e4a227b03d562c91bef9490ea6d5c480e3
-DIST lighttpd-1.4.72.tar.xz.asc 833 BLAKE2B 3ee4dc249dc7ca4d0a4880728da971e687a9f5ed29246d1b57d6fc98b894a075376f77ffd9fd4a74d5108e05718a12907db0b72d5edd6a1c1b0f6bedd1394964 SHA512 9ae5fda1c1c14cae97b9564a8558d6cfce64100839067372ae034c30a2f50290cb540602ac82d59b1d68363c47e48ec9778edfe6ace258b121798ad1f904d88e
 DIST lighttpd-1.4.73.tar.xz 1086680 BLAKE2B 2c7e8f9a9445b7986320e28dca82c59003b3438d8d9c5d67d299353f34f4eb4b1dd10c99752548eef9786ae67ee32c7a50b2dcfad2ecc3ca3d17e9e0b8d47f4b SHA512 ee41a72b09614d630174ef832b08c050708f62c0b6299e82b0a5f91a63d62702d31237ae5bb1850f0160b94e36a66af38a2d7abdaa920235265d416d2b0b4015
 DIST lighttpd-1.4.73.tar.xz.asc 833 BLAKE2B e38334feeb0be92126b7289f7724dcf557b0db6edede0de98e5a7d2b6d03a3bbd411c43a0fd18064605a349617b929249617964932a156351eda05c8f3e8ba60 SHA512 aa33ff5e9c489770363a801ec6d34a1520356f1a82d6a36980cef1d68d1677fdf0dfc0934b8082c263038d0442e05eb3a4e763e9a7c9a1846ec0c344138e635e
-EBUILD lighttpd-1.4.72.ebuild 6317 BLAKE2B 3c96615003ccb1be197795c912a217bd00f1fe1885e4ff325782ef9f55767c2ca43d7a88f26096bd4eaa0a949de1d2ac00376a54ac08fc3183caf4be89d02b9a SHA512 5c7f4004f3fbfb8acf60f3d11a651e24c090d6f306c836c2081be7b0336376e3ac12261a21428f41365d4058091af0572b211c9d54bc6b2037ceea8da7d4155e
+DIST lighttpd-1.4.74.tar.xz 1098796 BLAKE2B d651132b92b8e4c80e29905af11bf9245be524e715011ecbac68253ebce2342d69076731457775b009eee7e76c268f2cc218e314b2d5c7951e71222bf6c2570d SHA512 96ae90885898ec0a13441f135209a1e7c447b74b1dfbc16e75bdabcba30a4a4dd26878c205feed7f78311bcbc81b54602635cc0a64ea7fb8fe5e081f136fae2d
+DIST lighttpd-1.4.74.tar.xz.asc 833 BLAKE2B eb9d1dad82a3e2ebcfc02c15dc8cc0d31f2fab650bc51696f1b474ca5dafb6d1bd02a8022117d9112ce7845ab66e08537cd3821184b967b973ba6ab244fe5a50 SHA512 20befc3f48fcb1729ad7d318c93252e7b5dc2c734bad36f42a8703d2b04782d9e9d4ec90a82cdb646da19a8fa14ef3729b16c259ca0b96c1b0474c82b644f680
 EBUILD lighttpd-1.4.73.ebuild 6317 BLAKE2B 3c96615003ccb1be197795c912a217bd00f1fe1885e4ff325782ef9f55767c2ca43d7a88f26096bd4eaa0a949de1d2ac00376a54ac08fc3183caf4be89d02b9a SHA512 5c7f4004f3fbfb8acf60f3d11a651e24c090d6f306c836c2081be7b0336376e3ac12261a21428f41365d4058091af0572b211c9d54bc6b2037ceea8da7d4155e
+EBUILD lighttpd-1.4.74.ebuild 5640 BLAKE2B bc8e620e55a45ab72dbffa1409d4c4ddc35347234a21ecb352f2cb3bd823a3d914cb75b6806e51e53a475c8ec5f3d068fc390e1499ab01b8fd725847b8687972 SHA512 88edbafe7cb492ff3ecd615707a3a27ef05744d77ea801e5f785c25bf2ba4389689521f52391c6c77689eb20499bcbb74e187b244fa3326144f1b2a97554323f
 MISC metadata.xml 1939 BLAKE2B 46f98956773944353d138e6a1c5157675453078faaff227d0f2d2a78951d8284d1c05fce121fb490e46e6f7a5f544b467446814e7ebb71a844be466438fb1bb3 SHA512 e623f0b627fea7dfa5d388fada002ca40de94f1e95222d442ce310ff489b4eb0c0b4afb4e96acd2fa6034b53eed132a142c116b282bdb989cdda8a1c50ef9b13
diff --git a/www-servers/lighttpd/lighttpd-1.4.72.ebuild b/www-servers/lighttpd/lighttpd-1.4.74.ebuild
index 89558f7caf1e..5f2f6de8bf8e 100644
--- a/www-servers/lighttpd/lighttpd-1.4.72.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.74.ebuild
@@ -16,16 +16,12 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite test unwind webdav xattr +zlib zstd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
-	mysql? ( dbi )
-	postgres? ( dbi )
-	sqlite? ( dbi )
-	webdav? ( sqlite )
 "
 
 # Match the bundled xxhash version for the minimum version
@@ -37,9 +33,6 @@ COMMON_DEPEND="
 	brotli? ( app-arch/brotli:= )
 	dbi? (
 		dev-db/libdbi
-		mysql? ( dev-db/libdbi-drivers[mysql] )
-		postgres? ( dev-db/libdbi-drivers[postgres] )
-		sqlite? ( dev-db/libdbi-drivers[sqlite] )
 	)
 	gnutls? ( net-libs/gnutls )
 	kerberos? ( virtual/krb5 )
@@ -51,7 +44,6 @@ COMMON_DEPEND="
 	nss? ( dev-libs/nss )
 	pcre? ( dev-libs/libpcre2 )
 	php? ( dev-lang/php:*[cgi] )
-	rrdtool? ( net-analyzer/rrdtool )
 	sasl? ( dev-libs/cyrus-sasl )
 	ssl? ( >=dev-libs/openssl-0.9.7:= )
 	unwind? ( sys-libs/libunwind:= )
@@ -139,9 +131,6 @@ src_configure() {
 		$(meson_feature maxminddb with_maxminddb)
 		$(meson_use mbedtls with_mbedtls)
 
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_mysql=disabled
-
 		$(meson_use nettle with_nettle)
 		$(meson_use nss with_nss)
 
@@ -150,15 +139,11 @@ src_configure() {
 
 		$(meson_use pcre with_pcre2)
 
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_pgsql=disabled
-
 		$(meson_feature sasl with_sasl)
 		$(meson_use ssl with_openssl)
 
 		-Dwith_xxhash=enabled
 		$(meson_feature webdav with_webdav_props)
-		$(meson_feature webdav with_webdav_locks)
 
 		# Unpackaged in Gentoo
 		-Dwith_wolfssl=false
@@ -229,13 +214,6 @@ pkg_postinst() {
 		elog "https://wiki.lighttpd.net/Docs_ModDeflate"
 	fi
 
-	if use mysql ; then
-		elog
-		elog "Note that upstream has moved away from using mysql directly"
-		elog "via mod_mysql and is now accessing it through mod_dbi. You"
-		elog "may need to update your configuration"
-	fi
-
 	elog
 	elog "Upstream has deprecated a number of features. They are not missing"
 	elog "but have been migrated to other mechanisms. Please see upstream"