From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27C69158093 for ; Mon, 4 Jul 2022 06:57:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67C15E0886; Mon, 4 Jul 2022 06:57:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45E3FE0874 for ; Mon, 4 Jul 2022 06:57:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 85E0D341F44 for ; Mon, 4 Jul 2022 06:57:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30AFF525 for ; Mon, 4 Jul 2022 06:57:37 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1656917837.76ae5b30c671423cbd39e0edd9284562e2022058.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/deluge/deluge-2.0.5-r1.ebuild net-p2p/deluge/deluge-2.0.5-r2.ebuild net-p2p/deluge/deluge-9999.ebuild X-VCS-Directories: net-p2p/deluge/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 76ae5b30c671423cbd39e0edd9284562e2022058 X-VCS-Branch: master Date: Mon, 4 Jul 2022 06:57:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4d0d948d-b682-440d-837b-6ea680513bb4 X-Archives-Hash: da9bf975ae7c6b61410124f3e0c9eb45 commit: 76ae5b30c671423cbd39e0edd9284562e2022058 Author: Michał Górny gentoo org> AuthorDate: Sun Jun 26 09:51:43 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jul 4 06:57:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ae5b30 net-p2p/deluge: Account for dev-python/twisted USE={crypt → ssl} Signed-off-by: Michał Górny gentoo.org> net-p2p/deluge/{deluge-2.0.5-r1.ebuild => deluge-2.0.5-r2.ebuild} | 5 ++++- net-p2p/deluge/deluge-9999.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/net-p2p/deluge/deluge-2.0.5-r1.ebuild b/net-p2p/deluge/deluge-2.0.5-r2.ebuild similarity index 97% rename from net-p2p/deluge/deluge-2.0.5-r1.ebuild rename to net-p2p/deluge/deluge-2.0.5-r2.ebuild index ecb8c4c8a4fd..a7ebceeadb89 100644 --- a/net-p2p/deluge/deluge-2.0.5-r1.ebuild +++ b/net-p2p/deluge/deluge-2.0.5-r2.ebuild @@ -46,7 +46,10 @@ RDEPEND=" dev-python/rencode[${PYTHON_USEDEP}] dev-python/setproctitle[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - >=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}] + || ( + >=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}] + >=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}] + ) >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) gtk? ( diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index 9bf0efe9a73f..644f610caf03 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -46,7 +46,10 @@ RDEPEND=" dev-python/rencode[${PYTHON_USEDEP}] dev-python/setproctitle[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - >=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}] + || ( + >=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}] + >=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}] + ) >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) gtk? (