Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/servefile/files/, www-servers/servefile/
Date: Sun, 24 May 2020 13:57:43
Message-Id: 1590328641.504316d347e6ee9cd0cc25804e8ebea3351129fc.sping@gentoo
1 commit: 504316d347e6ee9cd0cc25804e8ebea3351129fc
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 24 13:56:35 2020 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Sun May 24 13:57:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504316d3
7
8 www-servers/servefile: 0.4.4_p20200211 + EAPI 7 + Python 3 + tests
9
10 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
11 Package-Manager: Portage-2.3.99, Repoman-2.3.22
12
13 www-servers/servefile/Manifest | 1 +
14 ...rvefile-0.4.4_p20200211-ipv6-absent-tests.patch | 25 +++++++++++++
15 .../servefile/servefile-0.4.4_p20200211.ebuild | 41 ++++++++++++++++++++++
16 3 files changed, 67 insertions(+)
17
18 diff --git a/www-servers/servefile/Manifest b/www-servers/servefile/Manifest
19 index f7b81d0d046..947d98b2df9 100644
20 --- a/www-servers/servefile/Manifest
21 +++ b/www-servers/servefile/Manifest
22 @@ -1 +1,2 @@
23 DIST servefile-0.4.4.tar.gz 14219 BLAKE2B 35bb49cc005a269bd73cb937f3a86faddedbc5e64925be13f6d193382a4bd817729b193f7f78b0b161b30438ff1fc978eefc5c3094c5f51845a157a65d674deb SHA512 31ce200db7c8deee9f135c2151565a41fa791dcaa969d9096e6aae2c6975673fd409320be09b7ca20b544326293ed73369f3bd77f379a2ec5f94642d4ef3e1f4
24 +DIST servefile-0.4.4_p20200211.tar.gz 18304 BLAKE2B 2bbd6534d7fb787a0b85d594bd0a2bc235c859f80618be24dea144ef2adaa6188a29efdffc2e9109229301b9d3ee09df6a9d746a15ae6b01fed44a21307df78e SHA512 ef4edb4c92d9f804970087fc1c3d59775740642516a06704258de6d972cb807123f309991a5e22469b7619aff2304e265d5749485a4f74e75f2c80c279a23c33
25
26 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
27 new file mode 100644
28 index 00000000000..685269d190d
29 --- /dev/null
30 +++ b/www-servers/servefile/files/servefile-0.4.4_p20200211-ipv6-absent-tests.patch
31 @@ -0,0 +1,25 @@
32 +From 3d34ff40f1a24873793c33b8f16a9940050fa93f Mon Sep 17 00:00:00 2001
33 +From: Sebastian Pipping <sebastian@×××××××.org>
34 +Date: Sun, 24 May 2020 15:51:15 +0200
35 +Subject: [PATCH] Fix test test_ipv4_only for global USE=-ipv6
36 +
37 +---
38 + tests/test_servefile.py | 2 +-
39 + 1 file changed, 1 insertion(+), 1 deletion(-)
40 +
41 +diff --git a/tests/test_servefile.py b/tests/test_servefile.py
42 +index 8132f6b..3f127f4 100644
43 +--- a/tests/test_servefile.py
44 ++++ b/tests/test_servefile.py
45 +@@ -137,7 +137,7 @@ def test_ipv4_only(run_servefile, datadir):
46 + check_download(data, fname='testfile', host='127.0.0.1')
47 +
48 + sock = socket.socket(socket.AF_INET6)
49 +- with pytest.raises(connrefused_exc):
50 ++ with pytest.raises((connrefused_exc, OSError)):
51 + sock.connect(("::1", 8080))
52 +
53 +
54 +--
55 +2.26.2
56 +
57
58 diff --git a/www-servers/servefile/servefile-0.4.4_p20200211.ebuild b/www-servers/servefile/servefile-0.4.4_p20200211.ebuild
59 new file mode 100644
60 index 00000000000..6f5570d2e3a
61 --- /dev/null
62 +++ b/www-servers/servefile/servefile-0.4.4_p20200211.ebuild
63 @@ -0,0 +1,41 @@
64 +# Copyright 1999-2020 Gentoo Authors
65 +# Distributed under the terms of the GNU General Public License v2
66 +
67 +EAPI=7
68 +PYTHON_COMPAT=( python3_{6,7,8} )
69 +
70 +inherit distutils-r1
71 +
72 +MY_COMMIT=864b2161b16e432c8ba19db1914809e080d793af
73 +DESCRIPTION="Serve a single file via HTTP"
74 +HOMEPAGE="https://github.com/sebageek/servefile"
75 +SRC_URI="https://github.com/sebageek/servefile/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
76 +
77 +LICENSE="GPL-3"
78 +SLOT="0"
79 +KEYWORDS="~amd64 ~x86"
80 +IUSE="ssl test"
81 +
82 +RDEPEND="
83 + ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
84 + sys-apps/grep
85 + sys-apps/iproute2
86 + sys-apps/net-tools
87 + sys-apps/sed"
88 +DEPEND="test? (
89 + ${RDEPEND}
90 + dev-python/requests[${PYTHON_USEDEP}]
91 + )"
92 +
93 +S="${WORKDIR}"/${PN}-${MY_COMMIT}
94 +
95 +PATCHES=(
96 + "${FILESDIR}"/${P}-ipv6-absent-tests.patch
97 +)
98 +
99 +distutils_enable_tests pytest
100 +
101 +src_install() {
102 + distutils-r1_src_install
103 + doman ${PN}.1
104 +}