gentoo resync : 10.09.2021

9 files changed, 75 insertions, 63 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index a652a8f21ccd..0fbfef91c797 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 26f5f94a8d74..58dd4c8bf467 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,4 +1,4 @@
 AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0c1ae0a2b079bef89b94f7e3a748d649a0840595f46047cee7ea388bd9514d1da88bb4a041a4a2c8ef SHA512 52a788e21a9aaa90a470a7861cd9856e3c2d2c52e3b4a23276c8b43e2a22f6f5aaec78caaf5f449463f1b856e0ffd83515e583f0ced00eada2d0afc00949ca77
 DIST nginx-unit-1.22.0.tar.gz 824763 BLAKE2B 3ef343d62f3cfe793840c78fe18fd68ecad93170c87df1769636e8516df21901712d7e82caa5bafc3bf76231f32531cb7b0c1bdbe04706ee176a1e57526c50eb SHA512 7418e9dd86c10d64184f5a2f3e26c27bacc53b90ba35658fba6af00a57df89645c16c16b510d3e570eee6f8fdeef4ec7f92971f7231093e3da118e858ed386f5
 EBUILD nginx-unit-1.22.0-r1.ebuild 1986 BLAKE2B 3acda1df9975cb822bb051544984567dc47e5ac7b57ee848235d5bce2cd0173e39ec26e43d7fea1f2b01c6280c348bba24b5fdd77b9f82fcbb4b3a9fc712c5eb SHA512 1115deb7a894188cf819b2611651f7b3515145e33f378d2ecf1f44d053b76722b3dade71d83faf9591d1bdb983737366958b201cb0e14a254343c32651fc5fda
-MISC metadata.xml 979 BLAKE2B ddf33bc4fb2cf4b03aab115c50d8903947e7798f36ea07830d2cd9d7cbe19479c08bdc0cce3376297232731c6cfa83ee76577ffc5ed74a80891dbf69463821c8 SHA512 e4dd1b43188c2b7858c35ca9ed016d7b423179dc651af19c0c0f2b8dfb45103b20fcfd685b3ec21f8cf839c677f2548040f7c155fb984f0873750301b7cb6d63
+MISC metadata.xml 1099 BLAKE2B fbbcfefcacc05e8ca3063c503551b7fa2ce78bf5c1b308362783f61bdd8817011cda83aaa31241be2e6d3a6d49ee3822d0a19bfa9efbed20c3c7c2a40edd8c38 SHA512 e4381c28854305dbf4c4b0de6d983815e37560c610745bf4c7911f8b5b20c7a80fb1f98b0b4047d3feddf660afb1b3710679cfb12ce2140e66e0a30dbd39c978
diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml
index 2145d93424ec..1f7e1456cef1 100644
--- a/www-servers/nginx-unit/metadata.xml
+++ b/www-servers/nginx-unit/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
+		<email>mpagano@gentoo.org</email>
+		<name>Mike Pagano</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
diff --git a/www-servers/servefile/Manifest b/www-servers/servefile/Manifest
index 34d120fe2819..2a1f8de387eb 100644
--- a/www-servers/servefile/Manifest
+++ b/www-servers/servefile/Manifest
@@ -1,4 +1,7 @@
 AUX servefile-0.4.4_p20200211-ipv6-absent-tests.patch 776 BLAKE2B db36dc2c79bd5551b539f71493472c88b258333f3493bf42d6c4323e06a223dfc07c8930662583fc91bbd2325c35da13f87b411a7fa2c32eb7e0c5237683f858 SHA512 e7e6d11c86efff0a8d0eb51e687686cbb962130a6c3d5117d863876337a49349500f9330ac6c865b871db80b0ed989585f9d01a386782b209841f6ce5092f654
+AUX servefile-0.5.2-ipv6-absent-tests.patch 794 BLAKE2B 7a4218f9524059f6de64608ddfdf914271c07f55137320f9557d677a22e36d935971306d7f154cf0324ebd9754f6feefde8bfa2c40754af2362f7ba99843a633 SHA512 3c0a37b3d51c4854fd4f0d706a017791d86e521b25ca1f3ef04b035aeaf868dddeacd8175ba9a3d8992c74102851e36f701c366289d3957396ba3d3d5f2222ea
 DIST servefile-0.5.1.tar.gz 19390 BLAKE2B 4443471870650f03564d6f574b633630fac4e1f9f6e6a9807b1baa4d3aaa6284f803fa9dc0c7c07f53cc343f89687db5f6b5a4ebf09e9fd327369e2b3aecddc5 SHA512 2502f3072522a8f460d3711dccbaa3fa57e34915313aaad475e5831962adc92c0728c2598f9f78ee99e60731cdc2d3026488ce8050369ab0c967246cd9372f44
+DIST servefile-0.5.2.tar.gz 20622 BLAKE2B 3d4f02803ec5228dd463313197718b0aced1f5ceaa3438c1e8a8605cdf5d6a87e38a8bb702dc24a15cb974076f185dfbc0af95b60f394612835d3286474cdcc4 SHA512 1abeef3ff1a9f21be079329616d78811412eb2f371e11e383dc23b586f8c7edc593539b6fa641e5d91bb6c1ab81a1f39f83e45bf7c55e904c9b683166ff79622
 EBUILD servefile-0.5.1-r1.ebuild 799 BLAKE2B f6a14184fdf3508f4ec28e16068d8308fd17869f1d37e98959491c06a1f1f7ff1f09a7f9786281fe7ed07251f0d05b825ae0f6a5e2842c8f2999b027619afdc9 SHA512 d6c4952e640e767267c50797f24692c26afea1aabb5c8868113224206b657aa5049226819cc4deaff34a222f569af1009dfda57fb107c4585de95ecc44784301
+EBUILD servefile-0.5.2.ebuild 789 BLAKE2B 8ea12f703f38e7ca44d04a0b9be22d0329953f385fef507f8f600ad000544b47658363f845e41eac18143c8a51ac975842f5f35d590722cc85e884932ea9da76 SHA512 049a68be8e152e40c451f77753fd3d8d3cabc33b49b7471848dbb934030a0df63610be20cc598228f612a04bbd9451d44c244595ff8fd820b4ad68906d9db743
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/www-servers/servefile/files/servefile-0.5.2-ipv6-absent-tests.patch b/www-servers/servefile/files/servefile-0.5.2-ipv6-absent-tests.patch
new file mode 100644
index 000000000000..6231fc8b7d91
--- /dev/null
+++ b/www-servers/servefile/files/servefile-0.5.2-ipv6-absent-tests.patch
@@ -0,0 +1,25 @@
+From 3d34ff40f1a24873793c33b8f16a9940050fa93f Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 24 May 2020 15:51:15 +0200
+Subject: [PATCH] Fix test test_ipv4_only for global USE=-ipv6
+
+---
+ tests/test_servefile.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_servefile.py b/tests/test_servefile.py
+index 8132f6b..3f127f4 100644
+--- a/tests/test_servefile.py
++++ b/tests/test_servefile.py
+@@ -137,7 +137,7 @@ def test_ipv4_only(run_servefile, datadir):
+     check_download(data, fname='testfile', host='127.0.0.1')
+ 
+     sock = socket.socket(socket.AF_INET6)
+-    with pytest.raises(connrefused_exc):
++    with pytest.raises((connrefused_exc, OSError)):
+         sock.connect(("::1", SERVEFILE_DEFAULT_PORT))
+ 
+ 
+-- 
+2.26.2
+
diff --git a/www-servers/servefile/servefile-0.5.2.ebuild b/www-servers/servefile/servefile-0.5.2.ebuild
new file mode 100644
index 000000000000..e086cb75329e
--- /dev/null
+++ b/www-servers/servefile/servefile-0.5.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Serve a single file via HTTP"
+HOMEPAGE="https://github.com/sebageek/servefile"
+SRC_URI="https://github.com/sebageek/servefile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl test"
+
+RDEPEND="
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	sys-apps/grep
+	sys-apps/iproute2
+	sys-apps/net-tools
+	sys-apps/sed"
+DEPEND="test? (
+		${RDEPEND}
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.2-ipv6-absent-tests.patch
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	doman ${PN}.1
+}
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 88e24efb8576..811bd51aa710 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -1,5 +1,3 @@
-DIST tornado-6.0.4.tar.gz 496204 BLAKE2B 6c092214d03baf5cf7615b780043e2fa40a4ed623b7ca59a2528cc3625ba904b21ef93c528278adedaf83e3b6e5a6311d867833dfe9826637e97918dee6fa334 SHA512 d29d69cf40f8b34fb2c55d81b6ecd9bc7c6fdf644eb4ff35452829510c0d5ec185da0a6067fec3e8afb2bedf9f5f08b06adb0ad53dcab04cb791a75abc304d6e
 DIST tornado-6.1.tar.gz 497359 BLAKE2B ed5981dec5cca962f907f97b7f906c1eef40d2b2b6d6cc16a21bd0a0a91ee58a60bea84b7ceeeff30b3462d707c56a5062c71d4ac8f25ca6a306ded6c6f072c5 SHA512 0ec1db1fad911182bda547c177a18b107b906cf66576443069e2b986cf041b3d4ebe08e5a168aa5cd3b56547f32f8b384bacaf74db89f582951d7b610b7494e8
-EBUILD tornado-6.0.4.ebuild 1378 BLAKE2B c6f2df1b4d99b49aee5ff67fbe2e231d20ff77162fbb7e1561ec8364eb4e8311cec852b1ed419f3b16057b0df0008ba6f096a94c7b1a6072652f70aef9e2d379 SHA512 4d9aa908a512a4f59e09008d301fcd6b4efaa5c3498d190c7e55e694f9740d2ebb1d3056ee73c7f973f4f1c35ad30e63eeea5d7a78d5126a0e4025e486472e4f
-EBUILD tornado-6.1.ebuild 1427 BLAKE2B 87c7990d336f2728df0154a78264f22748d961eabb1a33df8cd270039c5823cfb304e523ab243d5a09056f0e4686a7bc0883ad299182f3e3bdf99b2e877904ff SHA512 4443367672dfdbf70ca3373f2a2849c2be1c40c7a8edac17c245f24d80374beb870d2c53ee8db30f37c0b910d9fdb3fe4a47e4f74c7dc45be89e96b6843aa33c
+EBUILD tornado-6.1.ebuild 1426 BLAKE2B aa9fb7674c06b17a6175ce573144b4159b5a461e0283e732fa84bad4151fb36381d2b81c411cdf09290945e4ee25f0adbe423b175a6d79d10b93136c7c4401fc SHA512 6089bb6c2fbf7a9aedbb2ea01a2b923634313248c8f05323a731770cb6044a26fbbcc6ceacf0fc07ec098c44acb45ec239cc927e09db9bed874322f6ddcba640
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-6.0.4.ebuild b/www-servers/tornado/tornado-6.0.4.ebuild
deleted file mode 100644
index 4e12f2e4081b..000000000000
--- a/www-servers/tornado/tornado-6.0.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python web framework and asynchronous networking library"
-HOMEPAGE="https://www.tornadoweb.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinxcontrib-asyncio
-
-src_prepare() {
-	# it used to pass, so apparently something changed somewhere
-	sed -i -e 's:test_method_after_redirect:_&:' \
-		tornado/test/httpclient_test.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x ASYNC_TEST_TIMEOUT=60
-	cd "${BUILD_DIR}/lib" || die
-	"${PYTHON}" -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
-}
diff --git a/www-servers/tornado/tornado-6.1.ebuild b/www-servers/tornado/tornado-6.1.ebuild
index a379441dae81..07dc01f2ed59 100644
--- a/www-servers/tornado/tornado-6.1.ebuild
+++ b/www-servers/tornado/tornado-6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"