| 1 |
commit: 326caf9d88469e804cd3bfc8674c34d9e467d6c4 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 15 03:16:13 2021 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 15 03:16:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326caf9d |
| 7 |
|
| 8 |
net-mail/onionrouter: dev-python/pyyaml-6.0 and Python 3.10 support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 11 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/onionrouter-0.6.1-pyyaml-6.0.patch | 24 ++++++++++++++++++++++ |
| 14 |
...ter-9999.ebuild => onionrouter-0.6.1-r1.ebuild} | 8 ++++++-- |
| 15 |
net-mail/onionrouter/onionrouter-9999.ebuild | 4 ++-- |
| 16 |
3 files changed, 32 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-mail/onionrouter/files/onionrouter-0.6.1-pyyaml-6.0.patch b/net-mail/onionrouter/files/onionrouter-0.6.1-pyyaml-6.0.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..32dedec5712 |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-mail/onionrouter/files/onionrouter-0.6.1-pyyaml-6.0.patch |
| 23 |
@@ -0,0 +1,24 @@ |
| 24 |
+https://github.com/ehloonion/onionrouter/pull/26 |
| 25 |
+ |
| 26 |
+From 45853184a610fd83c77adaebb240f164214bd450 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Craig Andrews <candrews@××××××××××××.com> |
| 28 |
+Date: Thu, 14 Oct 2021 22:45:25 -0400 |
| 29 |
+Subject: [PATCH] Allow pyyaml 6.0 |
| 30 |
+ |
| 31 |
+--- |
| 32 |
+ setup.py | 2 +- |
| 33 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 34 |
+ |
| 35 |
+diff --git a/setup.py b/setup.py |
| 36 |
+index ad634ac..3b7d94c 100644 |
| 37 |
+--- a/setup.py |
| 38 |
++++ b/setup.py |
| 39 |
+@@ -11,7 +11,7 @@ |
| 40 |
+ |
| 41 |
+ requirements = [ |
| 42 |
+ "dnspython>=2.0.0,<3.0.0", |
| 43 |
+- "PyYAML>=4.2b1,<6.0.0", |
| 44 |
++ "PyYAML>=4.2b1", |
| 45 |
+ ] |
| 46 |
+ |
| 47 |
+ test_requirements = [ |
| 48 |
|
| 49 |
diff --git a/net-mail/onionrouter/onionrouter-9999.ebuild b/net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild |
| 50 |
similarity index 89% |
| 51 |
copy from net-mail/onionrouter/onionrouter-9999.ebuild |
| 52 |
copy to net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild |
| 53 |
index 2efd032bc84..e977bc3b27f 100644 |
| 54 |
--- a/net-mail/onionrouter/onionrouter-9999.ebuild |
| 55 |
+++ b/net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild |
| 56 |
@@ -1,9 +1,9 @@ |
| 57 |
-# Copyright 1999-2020 Gentoo Authors |
| 58 |
+# Copyright 1999-2021 Gentoo Authors |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
|
| 61 |
EAPI=7 |
| 62 |
|
| 63 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
| 64 |
+PYTHON_COMPAT=( python3_{7,8,9,10} ) |
| 65 |
DISTUTILS_SINGLE_IMPL=1 |
| 66 |
DISTUTILS_USE_SETUPTOOLS=rdepend |
| 67 |
|
| 68 |
@@ -36,6 +36,10 @@ BDEPEND="$(python_gen_cond_dep ' |
| 69 |
) |
| 70 |
')" |
| 71 |
|
| 72 |
+PATCHES=( |
| 73 |
+ "${FILESDIR}/${P}-pyyaml-6.0.patch" |
| 74 |
+) |
| 75 |
+ |
| 76 |
distutils_enable_tests pytest |
| 77 |
|
| 78 |
src_prepare() { |
| 79 |
|
| 80 |
diff --git a/net-mail/onionrouter/onionrouter-9999.ebuild b/net-mail/onionrouter/onionrouter-9999.ebuild |
| 81 |
index 2efd032bc84..396599972a7 100644 |
| 82 |
--- a/net-mail/onionrouter/onionrouter-9999.ebuild |
| 83 |
+++ b/net-mail/onionrouter/onionrouter-9999.ebuild |
| 84 |
@@ -1,9 +1,9 @@ |
| 85 |
-# Copyright 1999-2020 Gentoo Authors |
| 86 |
+# Copyright 1999-2021 Gentoo Authors |
| 87 |
# Distributed under the terms of the GNU General Public License v2 |
| 88 |
|
| 89 |
EAPI=7 |
| 90 |
|
| 91 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
| 92 |
+PYTHON_COMPAT=( python3_{7,8,9,10} ) |
| 93 |
DISTUTILS_SINGLE_IMPL=1 |
| 94 |
DISTUTILS_USE_SETUPTOOLS=rdepend |
Archives