gentoo auto-resync : 29:11:2022 - 07:19:33

6 files changed, 9 insertions, 74 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index aae207db6dfe..e83b1716cac8 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/servefile/Manifest b/www-servers/servefile/Manifest
index a5fa42d2314c..2af485358e08 100644
--- a/www-servers/servefile/Manifest
+++ b/www-servers/servefile/Manifest
@@ -1,9 +1,5 @@
-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
 DIST servefile-0.5.3.tar.gz 20761 BLAKE2B bc4bd25aca01e0ac7d00e684cc8b0f848b295df2f02fe441c05d634cd415f395b0e5e083b5771c1d0dcd45ad897ac00e75ca999a76a9d0d0719c82ddb558a029 SHA512 9e6dd5927808cbb66163f207bed28f2c044d996ef1f4e77163cbf257e3e66169f58e92dba252ae389660d11e01d307fc1d8c749e903e232853c70867ce44e219
-EBUILD servefile-0.5.1-r1.ebuild 799 BLAKE2B f6a14184fdf3508f4ec28e16068d8308fd17869f1d37e98959491c06a1f1f7ff1f09a7f9786281fe7ed07251f0d05b825ae0f6a5e2842c8f2999b027619afdc9 SHA512 d6c4952e640e767267c50797f24692c26afea1aabb5c8868113224206b657aa5049226819cc4deaff34a222f569af1009dfda57fb107c4585de95ecc44784301
-EBUILD servefile-0.5.2.ebuild 789 BLAKE2B 8ea12f703f38e7ca44d04a0b9be22d0329953f385fef507f8f600ad000544b47658363f845e41eac18143c8a51ac975842f5f35d590722cc85e884932ea9da76 SHA512 049a68be8e152e40c451f77753fd3d8d3cabc33b49b7471848dbb934030a0df63610be20cc598228f612a04bbd9451d44c244595ff8fd820b4ad68906d9db743
+EBUILD servefile-0.5.3-r1.ebuild 821 BLAKE2B 2839497c5be0a770fd5fdab1536eb80bb65fae47609bd78831e557eb900b27947e64b2bf6c1780bf73ab3c22d4000803f0b53608a39c98c0a65478934e04342d SHA512 eca3e19a42a754a9d35b18c50a1fd50778dd579cf4efe6a2fe7b025023b12e26b17ffe3eb0d30a0a301d21a9d4332dc8a4824de79451803b0615dadad7ac1884
 EBUILD servefile-0.5.3.ebuild 789 BLAKE2B 8ea12f703f38e7ca44d04a0b9be22d0329953f385fef507f8f600ad000544b47658363f845e41eac18143c8a51ac975842f5f35d590722cc85e884932ea9da76 SHA512 049a68be8e152e40c451f77753fd3d8d3cabc33b49b7471848dbb934030a0df63610be20cc598228f612a04bbd9451d44c244595ff8fd820b4ad68906d9db743
-MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
+MISC metadata.xml 333 BLAKE2B e2820cd75b4adee2d771732a0e792dd675bfd9f8ef358dd1e60953d125123b72fee9395cea1b514a14944f98d5a9be02c20f6b65a887ba2541e5ddb30c656e67 SHA512 99277006448b48f1a2ffa6cf487f8ca1b28a0491c15b438bdb45bc10ce3ea49aa21b5f825cfe42bde14d1c70d0bced60df16183a8c89ff5a4542eac0ded2f042
diff --git a/www-servers/servefile/files/servefile-0.4.4_p20200211-ipv6-absent-tests.patch b/www-servers/servefile/files/servefile-0.4.4_p20200211-ipv6-absent-tests.patch
deleted file mode 100644
index 685269d190d5..000000000000
--- a/www-servers/servefile/files/servefile-0.4.4_p20200211-ipv6-absent-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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", 8080))
- 
- 
--- 
-2.26.2
-
diff --git a/www-servers/servefile/metadata.xml b/www-servers/servefile/metadata.xml
index 6a22e9e318bb..a6a556a89e95 100644
--- a/www-servers/servefile/metadata.xml
+++ b/www-servers/servefile/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">sebageek/servefile</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-servers/servefile/servefile-0.5.1-r1.ebuild b/www-servers/servefile/servefile-0.5.1-r1.ebuild
deleted file mode 100644
index e97fe4599fcf..000000000000
--- a/www-servers/servefile/servefile-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.4.4_p20200211-ipv6-absent-tests.patch
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	doman ${PN}.1
-}
diff --git a/www-servers/servefile/servefile-0.5.2.ebuild b/www-servers/servefile/servefile-0.5.3-r1.ebuild
index e086cb75329e..623f1977123b 100644
--- a/www-servers/servefile/servefile-0.5.2.ebuild
+++ b/www-servers/servefile/servefile-0.5.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1