gentoo auto-resync : 17:01:2024 - 08:06:37

6 files changed, 4 insertions, 278 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 1950558410e3..e18ac48a41de 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 677f5f19b386..80409fd9fe74 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -2,18 +2,15 @@ AUX conf/lighttpd.conf-r1 7623 BLAKE2B 51805756814ed7ea8770419fa98009b1ecf6e963c
 AUX conf/mime-types.conf 5802 BLAKE2B 894906c67176dfb98819fe0d61e66905d873ad96907c14684a1b6284796ea69950606c950a72f16ffa9fdd46675ac79050cc39456ae66c91a38a50e1ef5449e9 SHA512 28fb746307daa92ae8077850627097d8ed4f24ad6f1c1963a3397a052add17282292e6f230550fb65d2fef969af0448f2f86e36afb5b15dc92b00fd80821c54a
 AUX conf/mod_cgi.conf 625 BLAKE2B 9d10f74566edd260a9160a7b3588aa08903603dafe412b73e0a28ce57b3e45c4bbebd0443daeb7e922c66bca66947f79c24eb65256cd5f6011ea2ad140c3f16f SHA512 39cba5cc14be21356c7038a8436a4dd7da80d18e3db2ba0527669f2ce9e9ca1a99a985e931e92cd7ea550f2b79467adc92b0803291f6d55084cca901919ea0da
 AUX conf/mod_fastcgi.conf 425 BLAKE2B 5c78303b686677bc77a6c9c51f295a023f4854ce351cf41e8984f84f6d8520fee93db4c96b25495bb935ed53d57090e481516c3fd4862401cea174fa2bccc0d2 SHA512 0847a55736dd86f6589086614331a54d1656214ab918638a319b69825ef67bfc8003fa567dc8b82c1c1611d2b4d2771dce4bdd337ecb9b277758a5dcf6c12331
-AUX lighttpd-1.4.69-fix-meson-typo.patch 1444 BLAKE2B 1f742b8cdc7965c7925baf25b22a28a5207591791970c3e9ec5b1667db06cbc01d94957bbbcc83cdd179ac6c9a35cfc1bcfe3caf5378b4656059ea1008a5fed0 SHA512 d3e38dffedad22c99f6409c9d7c8953430ae2bcd3f264be1218b393b7e01f9d2c7ccf43c0ded18b3931619c3ab4bf7b9cee9189c008dc15d9aa6ab238cbf34da
 AUX lighttpd.confd 240 BLAKE2B 8383c102f9e3a373909f26cda9f73d1edf81ef9dae42a48593f6d6f61c1b1060cc324bb773d402307d54c6cca520ddada8016dc5b3f0922ddf75d24934bfc7c4 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416
 AUX lighttpd.initd-r1 1993 BLAKE2B 719a854c4faad43a7d33303afd68950ec5393b63f485cfcbcd89e39b6a4a6eef3fe74a73acdd95dd948f7d3c822d0cca1a7da087c83eb455f50b2402a5ef8acd SHA512 545b923f199a6f3399df3cbd8122e7a5a83bf4128a59bf000690ccba1e6d9bd7ec3bd31aeecf4c7a14b6349ccc99df5ab4e6ff8ef9b3f026efd6ae628c872962
 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.71.tar.xz 1070904 BLAKE2B fa039ca7877050b4720c815c4bd164ad0fe7e367e4302b8e0a3ab92654a2169ded0b0a42209ca1a0561b5090670e8a8d71b594c65c439a8d03a49685405dae2a SHA512 c1388b563b9cf9dcab0a57bec42b09b2cb5e1932bc137ae5f957d1bf3932ddd8f5f188002a7b9a00f0a92ba3779b21ecbea2ccffa91e686b6660c9cc455d6598
 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.71.ebuild 6139 BLAKE2B 21e53ac5cf0119c4b4a59e9889fd2c2b7711c6c3fa5d7209b4a1c2774cc6139f1200565cc3e42ae1239f019b6a96809f08960f27ca1675c9c12456c3d6bc3966 SHA512 3f744c2fe227ddf28ba41c8d6e916e6737c2d3d2edcd8de4b077db57c25aadceb0ff125bafa17986762267e7300d312a3c2f159fdc5306323870564e59b56a8b
 EBUILD lighttpd-1.4.72.ebuild 6317 BLAKE2B 3c96615003ccb1be197795c912a217bd00f1fe1885e4ff325782ef9f55767c2ca43d7a88f26096bd4eaa0a949de1d2ac00376a54ac08fc3183caf4be89d02b9a SHA512 5c7f4004f3fbfb8acf60f3d11a651e24c090d6f306c836c2081be7b0336376e3ac12261a21428f41365d4058091af0572b211c9d54bc6b2037ceea8da7d4155e
-EBUILD lighttpd-1.4.73.ebuild 6323 BLAKE2B c588dd50341a484afa5599ca22844efbfc25fada20278e40cfdfd244c691ad31aa8f490854b94e9d0a737172c60e1de643f3701f48479fd8ea1cf0eee052b695 SHA512 c1204541495ace3c1ed8872e3d404265cae65317702318a12df9cadfb4599ee06efef462d9a3a6bfb0435f90d3b49e4204ae0a308760364476bda25739e1122c
-MISC metadata.xml 2022 BLAKE2B 93ba98e2fb87655c0d567056e3761e27f3c1145d8f2008fe9bec07ba7399737ff09fc927f8807b61fa82a2d80b3da872d56174acc39233023a26f179348d75d7 SHA512 717d1dceac8fe9a651fd8895271e7da1404050cb1b96556048d1a1a666d2f3d31a8475209fc1254a9be7d791c696eb156b4babe80337a20603f29126eb9f605f
+EBUILD lighttpd-1.4.73.ebuild 6320 BLAKE2B f662ca4eb9d9ef88139de8e6b921a354f1db67213338365750a2dac20d829287b32f963aca3d2e954449b9d25ff664d00f7d576668178633a9227117bf83beff SHA512 a4ee5cbffeaf138a1946bb5c22993b4666d3dae904ac21d5b9a19096667981b2833a9c20416ec294c069b28466870415638e772f76c8b8370f68879036c3edcb
+MISC metadata.xml 1939 BLAKE2B 46f98956773944353d138e6a1c5157675453078faaff227d0f2d2a78951d8284d1c05fce121fb490e46e6f7a5f544b467446814e7ebb71a844be466438fb1bb3 SHA512 e623f0b627fea7dfa5d388fada002ca40de94f1e95222d442ce310ff489b4eb0c0b4afb4e96acd2fa6034b53eed132a142c116b282bdb989cdda8a1c50ef9b13
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.69-fix-meson-typo.patch b/www-servers/lighttpd/files/lighttpd-1.4.69-fix-meson-typo.patch
deleted file mode 100644
index 07e65091a08c..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.4.69-fix-meson-typo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/lighttpd/lighttpd1.4/pull/127
-
-From 7445f72eb441052f7051f029b25d39855dc75e1c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 25 Jun 2023 06:18:40 +0100
-Subject: [PATCH] src: Fix 'getoption' meson typo
-
-Bug: https://bugs.gentoo.org/905219
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -381,7 +381,7 @@ if get_option('with_gnutls')
- 	# function: gnutls_check_version (-lgnutls)
- 	libgnutls = [ dependency('gnutls') ]
- 	conf_data.set('HAVE_GNUTLS_CRYPTO_H', true)
--	if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(getoption('with_nettle'))
-+	if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(get_option('with_nettle'))
- 	  libcrypto = [ dependency('gnutls') ]
- 	endif
- endif
-@@ -402,7 +402,7 @@ if get_option('with_nss')
- 	#libnss3 = [ compiler.find_library('nss3') ]
- 	#libnssutil3 = [ compiler.find_library('nssutil3') ]
- 	conf_data.set('HAVE_NSS3_NSS_H', true)
--	if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(getoption('with_nettle')) and not(getoption('with_gnutls'))
-+	if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(get_option('with_nettle')) and not(get_option('with_gnutls'))
- 	  libcrypto = [ dependency('nss') ]
- 	endif
- endif
-
diff --git a/www-servers/lighttpd/lighttpd-1.4.71.ebuild b/www-servers/lighttpd/lighttpd-1.4.71.ebuild
deleted file mode 100644
index aa1d2b30b102..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.71.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit lua-single meson readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
-SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz"
-
-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 +system-xxhash test unwind webdav xattr +zlib zstd"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	mysql? ( dbi )
-	postgres? ( dbi )
-	sqlite? ( dbi )
-	webdav? ( sqlite )
-"
-
-COMMON_DEPEND="
-	acct-group/lighttpd
-	acct-user/lighttpd
-	virtual/libcrypt:=
-	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 )
-	ldap? ( >=net-nds/openldap-2.1.26:= )
-	lua? ( ${LUA_DEPS} )
-	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls )
-	nettle? ( dev-libs/nettle:= )
-	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:= )
-	system-xxhash? ( dev-libs/xxhash )
-	unwind? ( sys-libs/libunwind:= )
-	webdav? (
-		dev-libs/libxml2
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( virtual/perl-Test-Harness )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.69-fix-meson-typo.patch
-)
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${ED}/etc/lighttpd/lighttpd.conf"
-
-	# Enable php/mod_fastcgi settings
-	if use php; then
-		sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die
-	fi
-
-	# Automatically listen on IPv6 if built with USE=ipv6 (which we now always do)
-	# bug #234987
-	sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die
-}
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}."
-	fi
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dmoduledir="$(get_libdir)"/${PN}
-
-		$(meson_feature brotli with_brotli)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_bzip=disabled
-
-		$(meson_feature dbi with_dbi)
-
-		# Unpackaged in Gentoo
-		-Dwith_libdeflate=disabled
-		# Obsolete
-		-Dwith_fam=disabled
-
-		$(meson_use gnutls with_gnutls)
-		$(meson_feature kerberos with_krb5)
-		$(meson_feature ldap with_ldap)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_libev=disabled
-
-		$(meson_feature unwind with_libunwind)
-
-		$(meson_use lua with_lua)
-		-Dlua_version=${ELUA}
-
-		$(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)
-
-		# Obsolete
-		-Dwith_pcre=disabled
-
-		$(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)
-		$(meson_feature system-xxhash with_xxhash)
-		$(meson_feature webdav with_webdav_props)
-		$(meson_feature webdav with_webdav_locks)
-
-		# Unpackaged in Gentoo
-		-Dwith_wolfssl=false
-
-		$(meson_use xattr with_xattr)
-		$(meson_feature zlib with_zlib)
-		$(meson_feature zstd with_zstd)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd-r1 lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-
-	# Configs
-	insinto /etc/lighttpd
-	newins "${FILESDIR}"/conf/lighttpd.conf-r1 lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-
-	# Update lighttpd.conf directives based on conditionals
-	update_config
-
-	# Docs
-	dodoc AUTHORS README NEWS doc/scripts/*.sh
-	newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
-	readme.gentoo_create_doc
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	doman doc/*.8
-
-	# Logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	readme.gentoo_print_elog
-
-	if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then
-		elog
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
-		elog "existing configuration."
-	fi
-
-	if use brotli || use zstd || use zlib ; then
-		elog
-		elog "Remember to clean your cache directory when using"
-		elog "output compression!"
-		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"
-	elog "changelog for details."
-	elog "https://www.lighttpd.net/2022/1/19/1.4.64/"
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.73.ebuild b/www-servers/lighttpd/lighttpd-1.4.73.ebuild
index 05f1cb6ef18c..eaa567bc4701 100644
--- a/www-servers/lighttpd/lighttpd-1.4.73.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.73.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+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"
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml
index 31ffea89b30a..acdf6d756893 100644
--- a/www-servers/lighttpd/metadata.xml
+++ b/www-servers/lighttpd/metadata.xml
@@ -22,7 +22,6 @@
 		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> as crypto backend</flag>
 		<flag name="nss">Build module for TLS via Mozilla's Network Security Services</flag>
 		<flag name="rrdtool">Enable rrdtool support via mod_rrdtool</flag>
-		<flag name="system-xxhash">Use system provided <pkg>dev-libs/xxhash</pkg></flag>
 		<flag name="webdav">Enable webdav properties</flag>
 		<flag name="zlib">Enable output compression via gzip or deflate algorithms from <pkg>sys-libs/zlib</pkg></flag>
 		<flag name="zstd">Enable output compression via Zstandard (<pkg>app-arch/zstd</pkg>) algorithm</flag>