From: Michał Górny <mgorny@gentoo.org>
Date: Thu, 26 Mar 2020 17:29:37 +0000 (+0100)
Subject: net-misc/openvswitch: Flatten twisted dep
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8c149763968b822c158261806a3b208881ec1fb3;p=gentoo.git

net-misc/openvswitch: Flatten twisted dep

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild
index a823c0b053fa..8a2e1ad91031 100644
--- a/net-misc/openvswitch/openvswitch-2.10.2.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.10.2.ebuild
@@ -21,10 +21,7 @@ RDEPEND="
 	ssl? ( dev-libs/openssl:0= )
 	${PYTHON_DEPS}
 	~dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
-	|| (
-		dev-python/twisted[conch,${PYTHON_USEDEP}]
-		dev-python/twisted-web[${PYTHON_USEDEP}]
-	)
+	dev-python/twisted[conch,${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 	debug? ( dev-lang/perl )"
 DEPEND="${RDEPEND}
diff --git a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
index 091d255356dd..715a907910b9 100644
--- a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
@@ -21,10 +21,7 @@ RDEPEND="
 	ssl? ( dev-libs/openssl:0= )
 	${PYTHON_DEPS}
 	~dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
-	|| (
-		dev-python/twisted[conch,${PYTHON_USEDEP}]
-		dev-python/twisted-web[${PYTHON_USEDEP}]
-	)
+	dev-python/twisted[conch,${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 	debug? ( dev-lang/perl )"
 DEPEND="${RDEPEND}