gentoo resync : 30.05.2020

4 files changed, 69 insertions, 32 deletions

diff --git a/www-servers/servefile/Manifest b/www-servers/servefile/Manifest
index ddb485637f92..f9f3d4c3ee0d 100644
--- a/www-servers/servefile/Manifest
+++ b/www-servers/servefile/Manifest
@@ -1,3 +1,4 @@
-DIST servefile-0.4.4.tar.gz 14219 BLAKE2B 35bb49cc005a269bd73cb937f3a86faddedbc5e64925be13f6d193382a4bd817729b193f7f78b0b161b30438ff1fc978eefc5c3094c5f51845a157a65d674deb SHA512 31ce200db7c8deee9f135c2151565a41fa791dcaa969d9096e6aae2c6975673fd409320be09b7ca20b544326293ed73369f3bd77f379a2ec5f94642d4ef3e1f4
-EBUILD servefile-0.4.4.ebuild 561 BLAKE2B 3d2ab28b86bdbc8a2b703a8088c870b708521fd7a4a4949b4e5d824e1fb64b85b68fe680fdcf78997d5240eb288d31c7287fb02080af4bf058582a80f07283fe SHA512 45ea05050064de7abe19eb765b3156415da5603df8b37aa07dabc4ad65e8c0be8930530a404beb6037ce90aedc2101bea5905bbad773fbbe0b50e07dbac2126c
+AUX servefile-0.4.4_p20200211-ipv6-absent-tests.patch 776 BLAKE2B db36dc2c79bd5551b539f71493472c88b258333f3493bf42d6c4323e06a223dfc07c8930662583fc91bbd2325c35da13f87b411a7fa2c32eb7e0c5237683f858 SHA512 e7e6d11c86efff0a8d0eb51e687686cbb962130a6c3d5117d863876337a49349500f9330ac6c865b871db80b0ed989585f9d01a386782b209841f6ce5092f654
+DIST servefile-0.4.4_p20200211.tar.gz 18304 BLAKE2B 2bbd6534d7fb787a0b85d594bd0a2bc235c859f80618be24dea144ef2adaa6188a29efdffc2e9109229301b9d3ee09df6a9d746a15ae6b01fed44a21307df78e SHA512 ef4edb4c92d9f804970087fc1c3d59775740642516a06704258de6d972cb807123f309991a5e22469b7619aff2304e265d5749485a4f74e75f2c80c279a23c33
+EBUILD servefile-0.4.4_p20200211.ebuild 853 BLAKE2B d87ccc93c478aaa6aa48194b5ded2af1b84f63ff7ae26e95811c1061393c1d7437766c4a79418339111c5e0b6308e6b3689b877eca071dabeb21a54da3c90d98 SHA512 59d729b25a13ef1d692887a5da11c0a9a0cb879ac338bd2232493a147a04d55774bc6430c92fc8ef2e2f20c538834115f7e59cc9bc82e83f730b0764c972ce21
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
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
new file mode 100644
index 000000000000..685269d190d5
--- /dev/null
+++ b/www-servers/servefile/files/servefile-0.4.4_p20200211-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", 8080))
+ 
+ 
+-- 
+2.26.2
+
diff --git a/www-servers/servefile/servefile-0.4.4.ebuild b/www-servers/servefile/servefile-0.4.4.ebuild
deleted file mode 100644
index 3766aa87b240..000000000000
--- a/www-servers/servefile/servefile-0.4.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Serve a single file via HTTP"
-HOMEPAGE="http://seba-geek.de/stuff/servefile/"
-SRC_URI="http://seba-geek.de/proj/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl )
-	sys-apps/grep
-	sys-apps/iproute2
-	sys-apps/net-tools
-	sys-apps/sed"
-
-src_install() {
-	distutils-r1_src_install
-
-	dodoc ChangeLog
-	doman ${PN}.1
-}
diff --git a/www-servers/servefile/servefile-0.4.4_p20200211.ebuild b/www-servers/servefile/servefile-0.4.4_p20200211.ebuild
new file mode 100644
index 000000000000..6f5570d2e3a6
--- /dev/null
+++ b/www-servers/servefile/servefile-0.4.4_p20200211.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_COMMIT=864b2161b16e432c8ba19db1914809e080d793af
+DESCRIPTION="Serve a single file via HTTP"
+HOMEPAGE="https://github.com/sebageek/servefile"
+SRC_URI="https://github.com/sebageek/servefile/archive/${MY_COMMIT}.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}"/${PN}-${MY_COMMIT}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ipv6-absent-tests.patch
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	doman ${PN}.1
+}