commit: 326caf9d88469e804cd3bfc8674c34d9e467d6c4 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Fri Oct 15 03:16:13 2021 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Fri Oct 15 03:16:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326caf9d
net-mail/onionrouter: dev-python/pyyaml-6.0 and Python 3.10 support Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../files/onionrouter-0.6.1-pyyaml-6.0.patch | 24 ++++++++++++++++++++++ ...ter-9999.ebuild => onionrouter-0.6.1-r1.ebuild} | 8 ++++++-- net-mail/onionrouter/onionrouter-9999.ebuild | 4 ++-- 3 files changed, 32 insertions(+), 4 deletions(-) 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 new file mode 100644 index 00000000000..32dedec5712 --- /dev/null +++ b/net-mail/onionrouter/files/onionrouter-0.6.1-pyyaml-6.0.patch @@ -0,0 +1,24 @@ +https://github.com/ehloonion/onionrouter/pull/26 + +From 45853184a610fd83c77adaebb240f164214bd450 Mon Sep 17 00:00:00 2001 +From: Craig Andrews <candr...@integralblue.com> +Date: Thu, 14 Oct 2021 22:45:25 -0400 +Subject: [PATCH] Allow pyyaml 6.0 + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index ad634ac..3b7d94c 100644 +--- a/setup.py ++++ b/setup.py +@@ -11,7 +11,7 @@ + + requirements = [ + "dnspython>=2.0.0,<3.0.0", +- "PyYAML>=4.2b1,<6.0.0", ++ "PyYAML>=4.2b1", + ] + + test_requirements = [ diff --git a/net-mail/onionrouter/onionrouter-9999.ebuild b/net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild similarity index 89% copy from net-mail/onionrouter/onionrouter-9999.ebuild copy to net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild index 2efd032bc84..e977bc3b27f 100644 --- a/net-mail/onionrouter/onionrouter-9999.ebuild +++ b/net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7,8,9,10} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=rdepend @@ -36,6 +36,10 @@ BDEPEND="$(python_gen_cond_dep ' ) ')" +PATCHES=( + "${FILESDIR}/${P}-pyyaml-6.0.patch" +) + distutils_enable_tests pytest src_prepare() { diff --git a/net-mail/onionrouter/onionrouter-9999.ebuild b/net-mail/onionrouter/onionrouter-9999.ebuild index 2efd032bc84..396599972a7 100644 --- a/net-mail/onionrouter/onionrouter-9999.ebuild +++ b/net-mail/onionrouter/onionrouter-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7,8,9,10} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=rdepend
