gentoo resync : 10.09.2021

3 files changed, 68 insertions, 0 deletions

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
+}