Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/argparse-manpage/, dev-python/argparse-manpage/files/
Date: Tue, 07 Sep 2021 12:17:29
Message-Id: 1631017034.763be25dcbe872d8fc44b4850cd5aee011b84b1d.arthurzam@gentoo
1 commit: 763be25dcbe872d8fc44b4850cd5aee011b84b1d
2 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 7 12:17:14 2021 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 7 12:17:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763be25d
7
8 dev-python/argparse-manpage: patch out six dep
9
10 Closes: https://bugs.gentoo.org/811969
11 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
12
13 .../argparse-manpage/argparse-manpage-1.5.ebuild | 4 ++++
14 .../files/argparse-manpage-1.5-remove-six-dep.patch | 19 +++++++++++++++++++
15 2 files changed, 23 insertions(+)
16
17 diff --git a/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild b/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild
18 index f1f23c8c017..749cf578346 100644
19 --- a/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild
20 +++ b/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild
21 @@ -14,4 +14,8 @@ LICENSE="Apache-2.0"
22 SLOT="0"
23 KEYWORDS="~amd64 ~x86"
24
25 +PATCHES=(
26 + "${FILESDIR}/${P}-remove-six-dep.patch"
27 +)
28 +
29 distutils_enable_tests pytest
30
31 diff --git a/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch b/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch
32 new file mode 100644
33 index 00000000000..7a5aa777739
34 --- /dev/null
35 +++ b/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch
36 @@ -0,0 +1,19 @@
37 +--- a/examples/copr/copr_cli/main.py
38 ++++ b/examples/copr/copr_cli/main.py
39 +@@ -8,15 +8,11 @@ import argparse
40 + import sys
41 + import datetime
42 + import time
43 +-import six
44 + import simplejson
45 + from collections import defaultdict
46 +
47 + import logging
48 +-if six.PY2:
49 +- from urlparse import urlparse
50 +-else:
51 +- from urllib.parse import urlparse
52 ++from urllib.parse import urlparse
53 +
54 + if sys.version_info < (2, 7):
55 + class NullHandler(logging.Handler):