gentoo resync : 09.07.2022

8 files changed, 165 insertions, 50 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 79bdba9ff2e7..957fee2d2168 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index b12ff72c7b51..7b239f9c11ba 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -2,5 +2,4 @@ AUX gunicorn-20.1.0-new-eventlet.patch 1103 BLAKE2B 3329864c05238c3b2a6e38727991
 AUX gunicorn-20.1.0-tests_optional_modules.patch 622 BLAKE2B 27efd7afd2c69e65622091f9fbc59e5db1efbd519015c51cc607735cb6c709b2234e3ee5fce045f3d2c3eb67099b68ae5295d7000df893775e3a28c050b5b0ce SHA512 42ef99e0ae1b125e379cd2d6ef3dd917de640db96411495eaa04c09eae88254fa7930f00de72571aca3320454eef2fdd54d16c97bb09b45abd7232965e4fb861
 DIST gunicorn-20.1.0.tar.gz 354960 BLAKE2B bae414a8da7a4dbdf79e0b46f517138534521a1a8544f4ea2e1e27e6778d2f6ad8d6a8af02590fedad47d305acdea53f1cdbc4deeda3619fc4a5ffef0932bea1 SHA512 4fd905f62adc30e044cf2a56a1a77e14bc633258267d6bfbd4f6a68494f93f377e9fb9ed94fab7f11f9d7813857a680974a88c4b6bf97d4f1b74792a81810111
 EBUILD gunicorn-20.1.0-r1.ebuild 1377 BLAKE2B f6d1c8052ead2295d1e10ec9a17cb3e21abd1ab1ff80b31ff14c2f6bb82b1da3c0bc7b477a86240d3b86c5505a7a6348b938e58cbb21cf95db407215f9919069 SHA512 6f2578376e402522776b9f9cb223d8abfc429f4b9ed78ce45725baf6ae5be95eb4a02a8415145861db4207c8d5a3fc56036ac67d1215cc18f3caa39efb61d9dc
-EBUILD gunicorn-20.1.0.ebuild 1491 BLAKE2B 4355e0d37670b335a42a5a6ad1a950666996007e0edbe89cf9b35a229ab82437cc23572d049ab5cdb0f3a45fdf9859b6cde584352465fa08531a3a325cf95dea SHA512 802c5a707b6cb3096a092e1d51d110eb12b42455a654839cf387da5bbd158ee77ea96342e05aca3572009a98cdd8121969e3bc7848342873194bbaeb7cb8cb62
 MISC metadata.xml 821 BLAKE2B aa75468eafd9c717f3b3b55b4c91917cd94e612f591e752c93bec95b57e5abd4f46fd98de88c52ca5c624dc00f6d45afbd03f04743f962f87be9321902142712 SHA512 c7746b7036159f99a67dcc688a839ec06adf85d2bfb2214a2ec0b961bfcbd9a72fb5f2dd66dc3868f0d50e5d99386e4a4251f872afd7ad932dc4cca6fc33dff3
diff --git a/www-servers/gunicorn/gunicorn-20.1.0.ebuild b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
deleted file mode 100644
index 0758612b5491..000000000000
--- a/www-servers/gunicorn/gunicorn-20.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="https://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
-# Tagged on GitHub on 2021-02-12 yet only got posted on PyPI on 2021-03-27, two weeks
-# before this ebuild got published. Will likely switch back to PyPI come next release.
-SRC_URI="https://github.com/benoitc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT PSF-2 doc? ( BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.1.0-tests_optional_modules.patch
-	"${FILESDIR}"/${P}-new-eventlet.patch
-)
-
-DOCS=( README.rst )
-
-distutils_enable_sphinx 'docs/source' --no-autodoc
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--cov=gunicorn --cov-report=xml::' -i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/source/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Alternative worker types need additional packages to be installed:"
-	optfeature "eventlet-based greenlets workers" "dev-python/eventlet"
-	optfeature "gevent-based greenlets workers" "dev-python/gevent"
-}
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index db145a70b92f..31ad9d1bc2d1 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,5 +1,7 @@
 AUX nginx-unit.initd 291 BLAKE2B e0d8b4bbdd9d57214551f4257b95271210a942fed747797f102b7932323b9bcbe871d9fd7cd0e8dee81eca2b41f21d5118a7f4f31c3fe6cbe18c1df09b164be0 SHA512 1212b49a56e4318476d051f8a3a82c6bb65f55adadd2dc51e3e91100823f6bdd8f82f162041db92fbc4f1a777cdafd22c32efce121a57f5d6eb3f5883da1abaa
 AUX nginx-unit.service 237 BLAKE2B 7e8b373372b7908bee80f4a57718a6b9ef7fd99872057006377284fb3bda088a0b6720b0246e5a27b6853d6351244432482f12afe5758b0f36dbdd1c04cce118 SHA512 fdf7ec12f58064c9a9fbd431fc4f56699563ff6bbf8124195810ca7a2e0ed813dbfdc41e6e1455b12960bd8d96fcf0eb2b632243d71d6a3b74d93a263c11596d
 DIST nginx-unit-1.26.1.tar.gz 865811 BLAKE2B eb0b62e48a8d0f9199dfe77a2d6ec90a06ac24f83b362ae16fde83eea53e03923127be7b24da47a83cf51fc4ebe7930cba9a3ee7550a5243f242cc4bfba3a3b9 SHA512 1caadb35cb208067a5d437e1f649c9f9a833a39c4344b2c3a5ae94d9fcd811913e2f23114cf8d7886030306e036da18c55f09044b8a575c1616568321b8d84ec
+DIST nginx-unit-1.27.0.tar.gz 871783 BLAKE2B 12fe08d5992bec6f1034f40b310f7cece74fd5c2211598f32eca35b0c79963e20e4eddc03604cce71340e5105895e42eb3748e1f923adb2f98a642cf0345ce41 SHA512 2f34ceccc966bffb790e3149f02c3769f6a41e6bb3cbaf4c5a9bcc512d9f1baf919e13b6d87fa29885561a449f72afd32b771206aa5d71daff9604bdbd7725a6
 EBUILD nginx-unit-1.26.1.ebuild 2039 BLAKE2B 9be21599b03a00bae312d974d01a3454eb197382ff3877e9f54c1d4c309e9e2f3601fd0cfd9633a2f0d4a82b1f8cedc87305c0f412d18093ca2be8d77e8a8792 SHA512 fb394c14106950166678c07bc615aaca76066d37790308265626a553b9492d74ccb4e2b9083e57bdcae73b6d02847cde0d0b8f91008f6e849aaa2607b961bf60
-MISC metadata.xml 781 BLAKE2B fb6e50498ed8c5d97653b02b544162666934a188a3cdce03f73edf4150304cd0777d6d216c31c8071ccb324906af662c717431e3b3554808e1655b411a26fdec SHA512 db5c97d9cdb3d78c2a69112e38e35cc0498b0319352aed87a1a0d0eb018801303021cb262fdac92d0aa7570f310e7cc3942f386e78fa47b265b9803039181fc2
+EBUILD nginx-unit-1.27.0.ebuild 2085 BLAKE2B 2c1b7564775ea6decb669001fc36f147dfef38a5ca72e78ec3be7a5fd004e549ff4c2b57326db61e4a7bbc23797918022840fc239e945e3324ba6e1c56f9709a SHA512 b4b2a2f21ea4ca43910fb231afe766ce234b05fe7cd840e7a23235736c8147728f848f1c7f40f6eff3a9d978254437e6a5a51e0196854666a623ecf9b2eda49d
+MISC metadata.xml 879 BLAKE2B dc106dc27a9308416d5d2c95ecfdcf1ed9fc0975cb4aded845f40bbd20e27e3e07742191cc42193a9063f2347d17a6eda7a76239dc49619058414c1993b487cc SHA512 159a0aa1d20d5eda346236b5961e51a74b77ea93b1c20ce1213fe51ffe476bd9e5ced1edf0dfef6cd408c1b6924a0aad3476dd24dbf1bd0e75abb59e6517c1b3
diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml
index 321aeb2afe3a..75eae13eaaaa 100644
--- a/www-servers/nginx-unit/metadata.xml
+++ b/www-servers/nginx-unit/metadata.xml
@@ -15,6 +15,8 @@
 	<use>
 		<flag name="php7-3">Support for PHP 7.3</flag>
 		<flag name="php7-4">Support for PHP 7.4</flag>
+		<flag name="php8-0">Support for PHP 7.4</flag>
+		<flag name="php8-1">Support for PHP 7.4</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">nginx/unit</remote-id>
diff --git a/www-servers/nginx-unit/nginx-unit-1.27.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.27.0.ebuild
new file mode 100644
index 000000000000..c72136b53615
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.27.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic python-single-r1 systemd toolchain-funcs
+
+MY_P="unit-${PV}"
+DESCRIPTION="Dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+MY_USE="perl python ruby"
+MY_USE_PHP="php7-4 php8-0 php8-1 "
+IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php7-4? ( dev-lang/php:7.4[embed] )
+	php8-0? ( dev-lang/php:8.0[embed] )
+	php8-1? ( dev-lang/php:8.1[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		dev-lang/ruby:=
+		dev-ruby/rubygems:=
+	)
+	ssl? ( dev-libs/openssl:0= )
+	virtual/libcrypt:0="
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	sed -i '/^CFLAGS/d' auto/make || die
+	default
+}
+
+src_configure() {
+	local opt=(
+		--control=unix:/run/${PN}.sock
+		--log=/var/log/${PN}
+		--modules=$(get_libdir)/${PN}
+		--pid=/run/${PN}.pid
+		--prefix=/usr
+		--state=/var/lib/${PN}
+	)
+
+	use ssl && opt+=( --openssl )
+	export AR="$(tc-getAR)"
+	export CC="$(tc-getCC)"
+	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
+
+	# Modules require position-independent code
+	append-cflags $(test-flags-CC -fPIC)
+
+	for flag in ${MY_USE} ; do
+		if use ${flag} ; then
+			./configure ${flag} || die "Module configuration failed: ${flag}"
+		fi
+	done
+
+	for flag in ${MY_USE_PHP} ; do
+		if use ${flag} ; then
+			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+			./configure php \
+				--module=${flag} \
+				--config=${php_slot}/bin/php-config \
+				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+		fi
+	done
+}
+
+src_install() {
+	default
+
+	diropts -m 0770
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+}
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 5a152ef0a899..735cf81effc6 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -1,4 +1,6 @@
 DIST tornado-6.1.tar.gz 497359 BLAKE2B ed5981dec5cca962f907f97b7f906c1eef40d2b2b6d6cc16a21bd0a0a91ee58a60bea84b7ceeeff30b3462d707c56a5062c71d4ac8f25ca6a306ded6c6f072c5 SHA512 0ec1db1fad911182bda547c177a18b107b906cf66576443069e2b986cf041b3d4ebe08e5a168aa5cd3b56547f32f8b384bacaf74db89f582951d7b610b7494e8
+DIST tornado-6.2.tar.gz 504849 BLAKE2B 18fee464e043e20dcdd5677bc3a72949140a64ce353e09a21242fcade6d8b668517553c649d65e892d9c3fabacea96903d4e42b70676a62759900abc8f4a202f SHA512 157cbeee21bef29ac68b319329e7fc57db4c68dbb5a245e2171b7a28427ebbfe16b745e3bdbdec5912caae5eaa60c3cbbf8830c9c76fec5ffdf025e234468517
 EBUILD tornado-6.1-r1.ebuild 1737 BLAKE2B 36c5ffb6a0566b103ee347172d05bc2688422a76f342cb0a240e7ac25a7d60a1e1ecd22d6f55e537d717324658a7e0e869dd0a11420be06f8532aca2a3a93762 SHA512 7227ef7fbee026e75a5064d5c56972899c9c2ef3759008c021958fb180c4c61d0a86eaa0fbceae5b3c43dbbfd707f881eed0b349b6baaa5b93094202d0053cdd
 EBUILD tornado-6.1.ebuild 1439 BLAKE2B 52e2446e769f5c7b55c653a8e396a1c1fe7c9e23f0c956a3199d3da41e9236c4cc08a9cc017f0a2a353b737803373bf5187b0ba5023fa5590a9c4f2805f72aec SHA512 795ed32b0d25730dd1ca73a589602e9f48c7cd069417a8f990ff2a8cd427cdafb77e28b1efa0558ba0e3556ed147f42aefcd50ecf4d8ae9f6db4139247b81188
+EBUILD tornado-6.2.ebuild 1737 BLAKE2B 36c5ffb6a0566b103ee347172d05bc2688422a76f342cb0a240e7ac25a7d60a1e1ecd22d6f55e537d717324658a7e0e869dd0a11420be06f8532aca2a3a93762 SHA512 7227ef7fbee026e75a5064d5c56972899c9c2ef3759008c021958fb180c4c61d0a86eaa0fbceae5b3c43dbbfd707f881eed0b349b6baaa5b93094202d0053cdd
 MISC metadata.xml 381 BLAKE2B 96d5942b11b6364eeac2248f6e92a9e7a54094ba2b6e9ef966be4143e1fa01fa0c417027d33a71c51bb094b905b9ff79e05107e1a9debb4b1ef932ba11fd8565 SHA512 cd4db13e0c6a9cf8b3c788c53dc5ecd0dce2cf783e7b2d67dba71299d1c6a3d1dd2c2a76c0d69816ab0da4ca23f831613323c55864fd858690c605da5426bf60
diff --git a/www-servers/tornado/tornado-6.2.ebuild b/www-servers/tornado/tornado-6.2.ebuild
new file mode 100644
index 000000000000..7e27327324af
--- /dev/null
+++ b/www-servers/tornado/tornado-6.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python web framework and asynchronous networking library"
+HOMEPAGE="
+	https://www.tornadoweb.org/
+	https://github.com/tornadoweb/tornado/
+	https://pypi.org/project/tornado/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinxcontrib-asyncio
+
+src_prepare() {
+	# Disable deprecation-warnings-as-errors because tornado has a lot of stuff deprecated in 3.10
+	sed 's/warnings.filterwarnings("error", category=DeprecationWarning, module=r"tornado\\..*")//' \
+		-i tornado/test/runtests.py || die
+	# broken upstream
+	sed -i -e 's:test_multi_line_headers:_&:' \
+		tornado/test/httpclient_test.py || die
+	# network-sandbox? ipv6?
+	sed -i -e 's:test_localhost:_&:' \
+		tornado/test/netutil_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x ASYNC_TEST_TIMEOUT=60
+	cd "${T}" || die
+	"${EPYTHON}" -m tornado.test.runtests --verbose ||
+		die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}