7 files changed, 16 insertions, 468 deletions
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 9bfeb6a13c89..53c7988c32cc 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,12 +1,9 @@
 AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3530be9d177bff755779251ea880d98addacf5476e3aae20145c95fad4d7baf594e58b9ebcaf2b0dde SHA512 d5bdc136374aed58ce206ea72cc45c72750f60117eef98960356b5cd64e2152c454af6b5aebb28f03ad46b42ea95a16fbf1e4a6f976ae78744550803ac775fe2
 AUX uwsgi-2.0.21-libphp-version.patch 399 BLAKE2B 274a099c3745533c4817f10d3d10524237cc05cfecf965c88251169b684969c55ea0340f6389cd54ed59bec070b2c1d2f20445a5f70f0124109774ec7c33f3a7 SHA512 7f11c6544bae789ec9cf08d3ca3c84a083a23b0da69cf4c577e5e13f7a1635a59e4f81a7005262d85c88ac97465ce08dd6a12f81a917d0aa81bc925fc7bfd05a
-AUX uwsgi-2.0.21-php82.patch 1457 BLAKE2B 89a31c86050fe1c94f1077e534d75f32d191f2b6402f72488f6fa50960b9ed44b1a39f80c05d2b5bbaf387e6cb8434951fd5092b70bad1f329ce43c87c5e13c1 SHA512 35b7e0f62cf18093aa1dcb8dda6158b3f2ab73c600d95fff048ded51ae91d442620c615c60597f67133f615998331e50e4ae592c7fdf66292f8efa4932cab867
-AUX uwsgi-2.0.21-python-unicode.patch 978 BLAKE2B 8014a39e6f29e38bb88cb5fe517c8656c80cd9aaed20ecb5ab56f526355f9b3616a5ac19635abb4514613b1e5c198364f8ab339292a8f282e1bd3f15ffd35a5a SHA512 9da61901ec176423bc14db8c58fac19305c2c5a4dc68f42d858376e65ca7399ddc6fe0665c3bd1f2ba379b6dd60a39d496a4b52c61c7dcf7d48ae47cddf555df
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3831 BLAKE2B e284adae0d4f467b6b28481b917d31a77703057e912c22fb0ae939a844a5579203e6521ba010c8480a6b1c13da27e3a3ee49ecffbabb0097c002f6660606c58f SHA512 5404f1a9d7a38d4eee9b005d5e43d59071d08b45a50747ec7f19978238881f76dd6a150907074eba32020cfef617ffd6495778c88d45bd0bf0acbc1da627c740
-DIST uwsgi-2.0.21.tar.gz 808494 BLAKE2B 3c5fc3ce3a6a7f8f915bb302c0b775a75227f859dd2b141034e8b1aa5cb867b447ed532b3e8b537db80acc908fc26121b752e35ebc0bf9a542678843fd02ff54 SHA512 36a9c1b87a4c3d08482b9045d2227f56b006acb53f38ddf1b510880ae5fc24c0177a077338ec8af3ef0b8f8e220bc4fc7f8311dab8066e13cbcbb616f736c795
 DIST uwsgi-2.0.23.tar.gz 810116 BLAKE2B be4353ac71a5282233b0a996e74e49bff66f4c460eb2640058c7028cfeae41214661785de78cdd4aa35415bcc4595e1e340ba48db87bee413754b13d8b24a7d8 SHA512 4060dd66f8c6309497b52a961c36a58fe2b3b3afc7e11b97cfa464757c614d1d44ccc561b18500a394b5d95e5660eae48759003a30ec07379a6f079f63f3899b
-EBUILD uwsgi-2.0.21-r1.ebuild 11262 BLAKE2B b8623e7c941af3acc13dd5b56d30cfc92cae839484a4e78bf1b0ec0e4f7389bbdae72b5820bc49ed39b46a5f8ff4b318811330450001a2c790d1a604669ef367 SHA512 109bbfdad841db210266717b5b6dd4027085375743046caa7525f786dbeaffbb8a0665ee7c6114f3a5ed04981e4a03b952b807bc30eab1e4f9b41b01ebb8be1b
-EBUILD uwsgi-2.0.21-r2.ebuild 10960 BLAKE2B 749e63002744946c0add6f4fdda11d29856a61f5fb39845ef61a77567c284d1416e7b91fc976549e12982e2bfba19c1db4d6d08d3569a5d73caabd6d183e4578 SHA512 086e4cafe4ac9ffa39908649a1a63fee5f754ae2d4fec9ce0e9da967893b8c49b047ffc19d46bdce4f849735d0d693d3cf0a9f1e27cebe506335748e56d6fd0b
-EBUILD uwsgi-2.0.23.ebuild 10878 BLAKE2B ec41bf934724bcf19b9789f45b02a9d517f2f52dc8afb10115532011bed35a8c4d7187a8ebe566c103846ef9fe85453180a02d301c94d55e52e09f21c921a68f SHA512 f9da6a606c0e32279fec517401d5584b168b0de9757f7024c599e8056a136deba2f7f825db168da0233599f89078c82857b9507bb0c311d760f8f7ca9c68cde3
-MISC metadata.xml 1245 BLAKE2B 3254a0e0211101ad9c353f6247424bb44df9ddb56bb152414b9fac2b515fe163e5163d2119bc040da1676b4d941afedf4a331a19e4cdbf794a7816d012abd328 SHA512 4e3dc2b9c9d7386ed6f132da703af971789c73af567f5333faca65e3194567ead794a84c28b5382eadb149ae4dcc7847e07bc02e3d84391b3b6cccc11e08e232
+DIST uwsgi-2.0.27.tar.gz 815302 BLAKE2B 6e1aab8a896405f0ab87fdb33bb14117cfd8473da61008e3ecf6b0d2664e7fd29acc12ba322c40772f015adb99ba79c3edcb40b87051fba918c162740d53f241 SHA512 78de6b8aa401ca5e27204cc68dec540617407dc9a0dad2c785a7eadc449889aad4eb516d4d8d257dc46e5b91b6c2d85be5953b19e0897375a7f0fecaa298d066
+EBUILD uwsgi-2.0.23.ebuild 10877 BLAKE2B 18f9c29fed7a010ada499843442c3ad69d041f0467f8d50a6e08e6bd924997430c00a2b1e204f06bc4569e303e98f244ad61c7edce66425d95f89811611e9253 SHA512 f997b3a7fd0dec1242be2862e47db99423a96b800d9316e19f55f919e156dd1f58386d28b20fae311615028a52dbdabb98635051d49226fb4016e3b7c1f73155
+EBUILD uwsgi-2.0.27.ebuild 10949 BLAKE2B 201f32315ec0771b6a4087c82afc9d726e78477a34cc0f3e6ea8a467b4dda3791575d101f791efb3225bdd4feba342d2a100e5056f705076e57f4cfae0dc0d0f SHA512 00b48fb153c56ab385c75bf631a40780be76c455260dda3ee91ca3d85c31f2d95dc06fc82e45ca0b5734639b9a43451a13f72f379058307269a20a0bc34031c0
+MISC metadata.xml 1049 BLAKE2B 5d12b036bb85027d016d48dbd975dac53c64778da842b00bfa7cf85188686838bcf3effb48e972650e3bc2bd39ec41123d6951650223e12319dd0ce79da64f15 SHA512 4aca870984e4c336b22a1047c7bf42f9f1b74059527327dcc343c3c3384a56b5ba0b6f54542fe1c75aab1b9699780bcf744a1d886f49cccf7a7aabf8d4347f58
diff --git a/www-servers/uwsgi/files/uwsgi-2.0.21-php82.patch b/www-servers/uwsgi/files/uwsgi-2.0.21-php82.patch
deleted file mode 100644
index 8a830389b989..000000000000
--- a/www-servers/uwsgi/files/uwsgi-2.0.21-php82.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/unbit/uwsgi/commit/6fba62a3ad947b656bb4379f8f903e90c7b01346
-
-From 6fba62a3ad947b656bb4379f8f903e90c7b01346 Mon Sep 17 00:00:00 2001
-From: Alexandre Rossi <alexandre.rossi@gmail.com>
-Date: Tue, 10 Jan 2023 10:01:05 +0000
-Subject: [PATCH] plugins/php: fix build with PHP >= 8.2
-
-from https://raw.githubusercontent.com/php/php-src/PHP-8.2/UPGRADING.INTERNALS:
-
-======================== 5. SAPI changes ========================
-
-* The signature of php_module_startup() has changed from
-
-int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_modules, uint32_t num_additional_modules)
-
-to
-
-zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_module)
-
-as only one additional module was ever provided.
----
- plugins/php/php_plugin.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
-index 9bb8befad..4d3930b82 100644
---- a/plugins/php/php_plugin.c
-+++ b/plugins/php/php_plugin.c
-@@ -607,7 +607,11 @@ static void activate_user_config(const char *filename, const char *doc_root, siz
- static int php_uwsgi_startup(sapi_module_struct *sapi_module)
- {
- 
-+#if ((PHP_MAJOR_VERSION >= 8) && (PHP_MINOR_VERSION >= 2))
-+	if (php_module_startup(&uwsgi_sapi_module, &uwsgi_module_entry)==FAILURE) {
-+#else
- 	if (php_module_startup(&uwsgi_sapi_module, &uwsgi_module_entry, 1)==FAILURE) {
-+#endif
- 		return FAILURE;
- 	} else {
- 		return SUCCESS;
-
diff --git a/www-servers/uwsgi/files/uwsgi-2.0.21-python-unicode.patch b/www-servers/uwsgi/files/uwsgi-2.0.21-python-unicode.patch
deleted file mode 100644
index b346c2655175..000000000000
--- a/www-servers/uwsgi/files/uwsgi-2.0.21-python-unicode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/unbit/uwsgi/commit/509104eaff6f6ecde656c20fdd65a0b98b371c8d
-
-From 509104eaff6f6ecde656c20fdd65a0b98b371c8d Mon Sep 17 00:00:00 2001
-From: Nicolas Evrard <nicoe@openhex.org>
-Date: Thu, 17 Nov 2022 09:47:39 +0100
-Subject: [PATCH] plugins/python: Use "backslashreplace" on stderr
- initialization
-
-Failing to use this value will result in enconding errors when logging
-unicode characters to stderr
---- a/plugins/python/python_plugin.c
-+++ b/plugins/python/python_plugin.c
-@@ -554,7 +554,7 @@ void init_uwsgi_vars() {
- #ifdef HAS_NO_ERRORS_IN_PyFile_FromFd
- 		PyObject *new_stdprint = PyFile_FromFd(2, NULL, "w", _IOLBF, NULL, NULL, 0);
- #else
--		PyObject *new_stdprint = PyFile_FromFd(2, NULL, "w", _IOLBF, NULL, NULL, NULL, 0);
-+		PyObject *new_stdprint = PyFile_FromFd(2, NULL, "w", _IOLBF, NULL, "backslashreplace", NULL, 0);
- #endif
- 		PyDict_SetItemString(pysys_dict, "stdout", new_stdprint);
- 		PyDict_SetItemString(pysys_dict, "__stdout__", new_stdprint);
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index 84453cdb8a75..3ddb3d62a7b8 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -8,7 +8,6 @@
 		<flag name="embedded">Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.</flag>
 		<flag name="go">Build the gccgo plugin to run Go applications.</flag>
 		<flag name="json">Support json as a configuration file format.</flag>
-		<flag name="python-asyncio">Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).</flag>
 		<flag name="routing">Enable routing support</flag>
 		<flag name="yaml">Support yaml as a configuration file format.</flag>
 		<flag name="yajl">Use <pkg>dev-libs/yajl</pkg> instead of <pkg>dev-libs/jansson</pkg> for parsing JSON configuration files (if USe=json is set)</flag>
diff --git a/www-servers/uwsgi/uwsgi-2.0.21-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.21-r1.ebuild
deleted file mode 100644
index 0cf22962797d..000000000000
--- a/www-servers/uwsgi/uwsgi-2.0.21-r1.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Check the upstream uwsgi-2.0 branch, not master, for backports
-
-LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+)"
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-PHP_EXT_INI="no"
-PHP_EXT_NAME="dummy"
-PHP_EXT_OPTIONAL_USE="php"
-USE_PHP="php8-1 php8-2" # deps must be registered separately below
-
-POSTGRES_COMPAT=( 13 14 15 )
-
-MY_P="${P/_/-}"
-
-inherit lua-single multiprocessing pax-utils php-ext-source-r3 postgres python-r1 ruby-ng
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="https://uwsgi-docs.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux"
-
-UWSGI_PLUGINS_STD=(
-	ping cache carbon nagios rpc rrdtool
-	http ugreen signal syslog rsyslog
-	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
-	{core,fast,raw,ssl}router
-	redislog mongodblog log{file,socket}
-	spooler cheaper_busyness symcall
-	transformation_{chunked,gzip,offload,tofile}
-	zergpool
-)
-UWSGI_PLUGINS_OPT=(
-	alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
-	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
-	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
-	rados router_{access,radius,spnego,xmldir}
-	sqlite ssi stats_pusher_statsd
-	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix
-)
-
-LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
-LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio ruby )
-
-# plugins to be ignored (for now):
-# cheaper_backlog2: example plugin
-# coroae: TODO
-# cplusplus: partially example code, needs explicit class
-# dummy: no idea
-# example: example plugin
-# exception_log: example plugin
-# *java*: TODO
-# v8: TODO
-# matheval: TODO
-IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq"
-
-for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
-for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
-IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
-
-REQUIRED_USE="
-	|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
-	uwsgi_plugins_logcrypto? ( ssl )
-	uwsgi_plugins_sslrouter? ( ssl )
-	routing? ( pcre )
-	uwsgi_plugins_emperor_pg? ( ${POSTGRES_REQ_USE} )
-	uwsgi_plugins_emperor_zeromq? ( zeromq )
-	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
-	uwsgi_plugins_router_xmldir? ( xml !expat )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	python-asyncio? ( python )
-	expat? ( xml )
-"
-
-# Dependency notes:
-# - util-linux is required for libuuid when requesting zeromq support
-# - sys-devel/gcc[go] is needed for libgo.so
-#
-# Order:
-# 1. Unconditional
-# 2. General features
-# 3. Plugins
-# 4. Language/app support
-CDEPEND="
-	sys-libs/zlib
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap )
-	json? (
-		!yajl? ( dev-libs/jansson:= )
-		yajl? ( dev-libs/yajl )
-	)
-	pcre? ( dev-libs/libpcre:3 )
-	ssl? ( dev-libs/openssl:= )
-	xml? (
-		!expat? ( dev-libs/libxml2 )
-		expat? ( dev-libs/expat )
-	)
-	yaml? ( dev-libs/libyaml )
-	zeromq? (
-		net-libs/zeromq
-		sys-apps/util-linux
-	)
-	uwsgi_plugins_alarm_curl? ( net-misc/curl )
-	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
-	uwsgi_plugins_curl_cron? ( net-misc/curl )
-	uwsgi_plugins_emperor_pg? ( ${POSTGRES_DEP} )
-	uwsgi_plugins_geoip? ( dev-libs/geoip )
-	uwsgi_plugins_ldap? ( net-nds/openldap:= )
-	uwsgi_plugins_pam? ( sys-libs/pam )
-	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
-	uwsgi_plugins_rados? ( sys-cluster/ceph )
-	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
-	uwsgi_plugins_router_spnego? ( virtual/krb5 )
-	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
-	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
-	uwsgi_plugins_xslt? ( dev-libs/libxslt )
-	go? ( sys-devel/gcc:=[go] )
-	lua? ( ${LUA_DEPS} )
-	mono? ( dev-lang/mono:= )
-	perl? ( dev-lang/perl:= )
-	php? (
-		php_targets_php8-1? ( dev-lang/php:8.1[embed] )
-		php_targets_php8-2? ( dev-lang/php:8.2[embed] )
-	)
-	python? ( ${PYTHON_DEPS} )
-	python-asyncio? ( dev-python/greenlet[${PYTHON_USEDEP}] )
-	ruby? ( $(ruby_implementations_depend) )
-"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-uwsgi )
-	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-php82.patch
-	"${FILESDIR}"/${P}-python-unicode.patch
-	"${FILESDIR}"/${P}-libphp-version.patch
-)
-
-pkg_setup() {
-	python_setup
-	use lua && lua-single_pkg_setup
-	use ruby && ruby-ng_pkg_setup
-	use uwsgi_plugins_emperor_pg && postgres_pkg_setup
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s|'-O2', ||" \
-		-e "s|'-Werror', ||" \
-		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
-		uwsgiconfig.py || die "sed failed"
-
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|" \
-		plugins/php/uwsgiplugin.py || die "sed failed"
-}
-
-src_configure() {
-	local embedded_plugins=()
-	local plugins=()
-	local malloc_impl="libc"
-	local json="false"
-	local xml="false"
-
-	local p
-	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
-		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
-	done
-	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
-		use ${p} && plugins+=("${p}")
-	done
-
-	# do not embed any plugins
-	if ! use embedded; then
-		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
-		embedded_plugins=()
-	fi
-
-	# flatten the arrays
-	plugins=${plugins[@]}
-	embedded_plugins=${embedded_plugins[@]}
-
-	# rename some of the use flags, language plugins are always real plugins
-	plugins="${plugins/perl/psgi}"
-	plugins="${plugins/sqlite/sqlite3}"
-	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
-
-	# override defaults as requested by the user
-	if use xml; then
-		use expat && xml="expat" || xml="libxml2"
-	fi
-	if use json; then
-		use yajl && json="yajl" || json="jansson"
-	fi
-	use jemalloc && malloc_impl="jemalloc"
-
-	# prepare the buildconf for gentoo
-	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
-	sed -i \
-		-e "s|VAR_XML|${xml}|" \
-		-e "s|VAR_YAML|$(usex yaml libyaml true)|" \
-		-e "s|VAR_JSON|${json}|" \
-		-e "s|VAR_SSL|$(usex ssl true false)|" \
-		-e "s|VAR_PCRE|$(usex pcre true false)|" \
-		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
-		-e "s|VAR_ROUTING|$(usex routing true false)|" \
-		-e "s|VAR_DEBUG|$(usex debug true false)|" \
-		-e "s|VAR_MALLOC|${malloc_impl}|" \
-		-e "s|VAR_PLUGINS|${plugins// /, }|" \
-		-e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \
-		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
-		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
-		buildconf/gentoo.ini || die "sed failed"
-
-	if ! use caps; then
-		sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-	fi
-
-	if ! use zeromq; then
-		sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-	fi
-
-	if use uwsgi_plugins_emperor_pg ; then
-		sed -i \
-			-e "s|pg_config|${PG_CONFIG}|" \
-			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
-	fi
-}
-
-each_ruby_compile() {
-	cd "${WORKDIR}/${MY_P}" || die "sed failed"
-
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
-}
-
-python_compile_plugins() {
-	local EPYV
-	local PYV
-	EPYV=${EPYTHON/.}
-	PYV=${EPYV/python}
-
-	${EPYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
-
-	if use python-asyncio ; then
-		${EPYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
-		${EPYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed"
-	fi
-}
-
-python_install_symlinks() {
-	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
-}
-
-src_compile() {
-	mkdir -p "${T}/plugins" || die
-
-	export CPUCOUNT="$(makeopts_jobs)"
-
-	${EPYTHON} uwsgiconfig.py --build gentoo || die "building uwsgi failed"
-
-	if use go ; then
-		${EPYTHON} uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
-	fi
-
-	if use lua ; then
-		# setting the name for the pkg-config file to lua, since that is the name
-		# provided by the wrapper from Lua eclasses
-		UWSGICONFIG_LUAPC="lua" ${EPYTHON} uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
-	fi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" ${EPYTHON} uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
-		done
-	fi
-
-	if use python ; then
-		python_foreach_impl python_compile_plugins
-	fi
-
-	if use ruby ; then
-		ruby-ng_src_compile
-	fi
-}
-
-src_install() {
-	dobin uwsgi
-	pax-mark m "${D}"/usr/bin/uwsgi
-
-	insinto /usr/$(get_libdir)/uwsgi
-	doins "${T}/plugins"/*.so
-
-	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
-	use go && dosym uwsgi /usr/bin/uwsgi_go
-	use lua && dosym uwsgi /usr/bin/uwsgi_lua
-	use mono && dosym uwsgi /usr/bin/uwsgi_mono
-	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
-
-	if use php ; then
-		local s
-		for s in $(php_get_slots); do
-			dosym uwsgi /usr/bin/uwsgi_${s/.}
-		done
-	fi
-
-	if use python ; then
-		python_foreach_impl python_install_symlinks
-		python_foreach_impl python_domodule uwsgidecorators.py
-	fi
-
-	newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi
-	newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi
-	keepdir /etc/"${PN}".d
-	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
-}
-
-pkg_postinst() {
-	if use apache2 ; then
-		ewarn "As reported on bug #650776 [1], Apache module mod_proxy_uwsgi"
-		ewarn "is being transferred to upstream Apache since 2.4.30, see [2]."
-		ewarn "We therefore do not build them any more."
-		ewarn "    [1] https://bugs.gentoo.org/650776"
-		ewarn "    [2] https://github.com/unbit/uwsgi/issues/1636"
-	fi
-
-	elog "Append the following options to the uwsgi call to load the respective language plugin:"
-	use cgi    && elog "  '--plugins cgi' for cgi"
-	use lua    && elog "  '--plugins lua' for lua"
-	use mono   && elog "  '--plugins mono' for mono"
-	use perl   && elog "  '--plugins psgi' for perl"
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			elog "  '--plugins ${s/.}' for ${s}"
-		done
-	fi
-
-	python_pkg_postinst() {
-		local EPYV
-		local PYV
-		EPYV=${EPYTHON/.}
-		PYV=${EPYV/python}
-
-		elog " "
-		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
-		if use python-asyncio ; then
-			elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
-		fi
-	}
-
-	use python && python_foreach_impl python_pkg_postinst
-
-	if use ruby ; then
-		for ruby in $(ruby_get_use_implementations) ; do
-			elog "  '--plugins rack_${ruby/.}' for ${ruby}"
-			elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
-			elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
-		done
-	fi
-}
diff --git a/www-servers/uwsgi/uwsgi-2.0.23.ebuild b/www-servers/uwsgi/uwsgi-2.0.23.ebuild
index 8dbf30d9442c..2b9d25ee0baf 100644
--- a/www-servers/uwsgi/uwsgi-2.0.23.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.23.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=(
 	ping cache carbon nagios rpc rrdtool
diff --git a/www-servers/uwsgi/uwsgi-2.0.21-r2.ebuild b/www-servers/uwsgi/uwsgi-2.0.27.ebuild
index 4061773d83a6..2b5ca04b4977 100644
--- a/www-servers/uwsgi/uwsgi-2.0.21-r2.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.27.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Check the upstream uwsgi-2.0 branch, not master, for backports
 
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32"
 
 PHP_EXT_INI="no"
 PHP_EXT_NAME="dummy"
 PHP_EXT_OPTIONAL_USE="php"
 USE_PHP="php8-1 php8-2" # deps must be registered separately below
 
-POSTGRES_COMPAT=( 13 14 15 )
+POSTGRES_COMPAT=( 13 14 15 16 )
 
 MY_P="${P/_/-}"
 
-inherit lua-single multiprocessing pax-utils php-ext-source-r3 postgres python-r1 ruby-ng
+inherit flag-o-matic lua-single multiprocessing pax-utils php-ext-source-r3
+inherit postgres python-r1 ruby-ng
 
 DESCRIPTION="uWSGI server for Python web applications"
 HOMEPAGE="https://uwsgi-docs.readthedocs.io/en/latest/"
@@ -101,7 +102,7 @@ CDEPEND="
 		!yajl? ( dev-libs/jansson:= )
 		yajl? ( dev-libs/yajl )
 	)
-	pcre? ( dev-libs/libpcre:3 )
+	pcre? ( dev-libs/libpcre2 )
 	ssl? ( dev-libs/openssl:= )
 	xml? (
 		!expat? ( dev-libs/libxml2 )
@@ -145,12 +146,6 @@ RDEPEND="
 "
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-php82.patch
-	"${FILESDIR}"/${P}-python-unicode.patch
-	"${FILESDIR}"/${P}-libphp-version.patch
-)
-
 pkg_setup() {
 	python_setup
 	use lua && lua-single_pkg_setup
@@ -215,6 +210,9 @@ src_configure() {
 	fi
 	use jemalloc && malloc_impl="jemalloc"
 
+	# Incompatible w/ C23 prototypes
+	append-cflags -std=gnu17
+
 	# prepare the buildconf for gentoo
 	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
 	sed -i \
@@ -223,6 +221,7 @@ src_configure() {
 		-e "s|VAR_JSON|${json}|" \
 		-e "s|VAR_SSL|$(usex ssl true false)|" \
 		-e "s|VAR_PCRE|$(usex pcre true false)|" \
+		-e "s|VAR_PCRE2|$(usex pcre true false)|" \
 		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
 		-e "s|VAR_ROUTING|$(usex routing true false)|" \
 		-e "s|VAR_DEBUG|$(usex debug true false)|" \