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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 949B4138350 for ; Thu, 26 Mar 2020 17:36:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B369BE0AC1; Thu, 26 Mar 2020 17:36:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B20FE0AC1 for ; Thu, 26 Mar 2020 17:36:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4DDBC34FA23 for ; Thu, 26 Mar 2020 17:36:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8448F1B1 for ; Thu, 26 Mar 2020 17:36:21 +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: <1585244158.7f3158e874904e547bed32548c9344a64946f266.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-1.3.15-r5.ebuild net-p2p/deluge/deluge-1.3.15-r6.ebuild net-p2p/deluge/deluge-1.3.15-r7.ebuild net-p2p/deluge/deluge-1.3.9999.ebuild X-VCS-Directories: net-p2p/deluge/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7f3158e874904e547bed32548c9344a64946f266 X-VCS-Branch: master Date: Thu, 26 Mar 2020 17:36:21 +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: 6b30050e-0875-4ba1-bd44-cd8d9ec2f5f2 X-Archives-Hash: fc29c55eafa84759ad53b912547aa7de commit: 7f3158e874904e547bed32548c9344a64946f266 Author: Michał Górny gentoo org> AuthorDate: Thu Mar 26 17:29:39 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Mar 26 17:35:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3158e8 net-p2p/deluge: Flatten twisted dep Signed-off-by: Michał Górny gentoo.org> net-p2p/deluge/deluge-1.3.15-r5.ebuild | 7 +------ net-p2p/deluge/deluge-1.3.15-r6.ebuild | 7 +------ net-p2p/deluge/deluge-1.3.15-r7.ebuild | 7 +------ net-p2p/deluge/deluge-1.3.9999.ebuild | 7 +------ 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/net-p2p/deluge/deluge-1.3.15-r5.ebuild b/net-p2p/deluge/deluge-1.3.15-r5.ebuild index 61514eb8e1d..bb90b884827 100644 --- a/net-p2p/deluge/deluge-1.3.15-r5.ebuild +++ b/net-p2p/deluge/deluge-1.3.15-r5.ebuild @@ -46,12 +46,7 @@ RDEPEND="${CDEPEND} dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] - || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] - ( - >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}] - ) - ) + >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] ) gtk? ( sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] ) diff --git a/net-p2p/deluge/deluge-1.3.15-r6.ebuild b/net-p2p/deluge/deluge-1.3.15-r6.ebuild index f044210962a..58e3297a8a9 100644 --- a/net-p2p/deluge/deluge-1.3.15-r6.ebuild +++ b/net-p2p/deluge/deluge-1.3.15-r6.ebuild @@ -45,12 +45,7 @@ RDEPEND=" dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] - || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] - ( - >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}] - ) - ) + >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] ) gtk? ( sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] ) diff --git a/net-p2p/deluge/deluge-1.3.15-r7.ebuild b/net-p2p/deluge/deluge-1.3.15-r7.ebuild index 13817ba74ca..018c45c4ff6 100644 --- a/net-p2p/deluge/deluge-1.3.15-r7.ebuild +++ b/net-p2p/deluge/deluge-1.3.15-r7.ebuild @@ -46,12 +46,7 @@ RDEPEND=" dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] - || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] - ( - >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}] - ) - ) + >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] ) gtk? ( sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] ) diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild index af10c260e9f..33dd3918e4e 100644 --- a/net-p2p/deluge/deluge-1.3.9999.ebuild +++ b/net-p2p/deluge/deluge-1.3.9999.ebuild @@ -47,12 +47,7 @@ RDEPEND=" dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] - || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] - ( - >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}] - ) - ) + >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] ) gtk? ( sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )