[gentoo-commits] repo/gentoo:master commit in: net-mail/onionrouter/files/, net-mail/onionrouter/

[Craig Andrews]

commit:     39cc42da4b1b3082ff84e114fca8762f5b87a385
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 15 15:16:14 2021 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Oct 15 15:17:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39cc42da

net-mail/onionrouter: Cleanup old version

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 net-mail/onionrouter/Manifest                      |  1 -
 .../files/onionrouter-0.6.1-pyyaml-6.0.patch       | 24 ----------
 net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild   | 54 ----------------------
 3 files changed, 79 deletions(-)

diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest
index ac1a8da0f39..3c4449ec1d7 100644
--- a/net-mail/onionrouter/Manifest
+++ b/net-mail/onionrouter/Manifest
@@ -1,2 +1 @@
-DIST onionrouter-0.6.1.tar.gz 26584 BLAKE2B e1d722ba4e7ec617e39fda54299cd71d9d47bbd34fd44a19ffef8f2349f9b238251b47d01c369223393a9d7f2e0a05c5d8b7dc9f991c7d386ba800086b8cc226 SHA512 5d08e7a7310e69e29eaba2098a62cef4b5044c207f4a78b4cfebfd2a9d18bd812b485793ff7395186d4949ad9604b4e82dc0e9b1200abf03108466bf531a6d15
 DIST onionrouter-0.6.2.tar.gz 27920 BLAKE2B e9158fe7e066968d9569fb84085a85300774f6b2a2f070216755a3444c6a0352da847a7a383bed4cd792083c1fc8d71039c2c7b3e4c0c21aeca6bcb0c440de44 SHA512 4d5db2f856d6a52dfd43b7d3fea4317a1238ba6410c1da953e1cb59519ef8c18e3b73f676beff9612a853030762570f386dca24a7d7be4add23493e0b344535e

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
deleted file mode 100644
index 32dedec5712..00000000000
--- a/net-mail/onionrouter/files/onionrouter-0.6.1-pyyaml-6.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/ehloonion/onionrouter/pull/26
-
-From 45853184a610fd83c77adaebb240f164214bd450 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@××××××××××××.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-0.6.1-r1.ebuild b/net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild
deleted file mode 100644
index e977bc3b27f..00000000000
--- a/net-mail/onionrouter/onionrouter-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 systemd
-
-DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix"
-HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="$(python_gen_cond_dep '
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-')"
-BDEPEND="$(python_gen_cond_dep '
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-')"
-
-PATCHES=(
-	"${FILESDIR}/${P}-pyyaml-6.0.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	insinto /etc/onionrouter
-	doins "${S}/onionrouter/configs/onionrouter.ini"
-}