public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
Date: Thu, 26 Mar 2020 17:36:21 +0000 (UTC)	[thread overview]
Message-ID: <1585244157.8c149763968b822c158261806a3b208881ec1fb3.mgorny@gentoo> (raw)

commit:     8c149763968b822c158261806a3b208881ec1fb3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 17:29:37 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 17:35:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c149763

net-misc/openvswitch: Flatten twisted dep

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

 net-misc/openvswitch/openvswitch-2.10.2.ebuild    | 5 +----
 net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild
index a823c0b053f..8a2e1ad9103 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 091d255356d..715a907910b 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}


             reply	other threads:[~2020-03-26 17:36 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-26 17:36 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-28 22:01 [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/ Sam James
2024-05-05 23:29 Robin H. Johnson
2024-05-05 23:29 Robin H. Johnson
2024-05-05 17:02 Matthew Thode
2024-04-29 10:38 Joonas Niilola
2024-04-29 10:36 Joonas Niilola
2024-03-04  7:53 Joonas Niilola
2023-12-11 13:04 Joonas Niilola
2023-05-16  1:52 Sam James
2023-04-07 23:12 Matthew Thode
2023-04-07 23:12 Matthew Thode
2023-04-07 23:12 Matthew Thode
2023-02-02  4:50 Sam James
2023-01-06 15:37 John Helmert III
2022-08-12 10:19 Agostino Sarubbo
2022-08-12 10:17 Agostino Sarubbo
2022-07-29  4:17 Sam James
2022-07-24  0:40 Sam James
2022-07-24  0:36 Sam James
2022-07-18 14:04 Matthew Thode
2022-07-18 14:04 Matthew Thode
2022-07-02 12:37 Sam James
2022-07-02 12:35 Sam James
2021-07-30 23:31 Sam James
2021-06-05 20:46 Matthew Thode
2021-06-05 20:41 Matthew Thode
2021-03-07 11:58 David Seifert
2021-01-13 20:10 Matthew Thode
2020-12-22  1:47 Matthew Thode
2020-08-08 12:18 Mikle Kolyada
2020-06-23 18:39 Matthew Thode
2020-06-23 18:39 Matthew Thode
2020-05-11 16:45 Agostino Sarubbo
2020-04-23 20:08 Matthew Thode
2020-04-23 19:19 Matthew Thode
2020-02-05 16:53 Michał Górny
2019-06-27 15:25 Matthew Thode
2019-06-27 15:25 Matthew Thode
2019-06-02 17:22 Matthew Thode
2019-04-13 17:08 Tiziano Müller
2019-03-27 14:50 Matthew Thode
2018-12-19 21:15 Matthew Thode
2018-11-26  3:00 Matthew Thode
2018-09-21 22:39 Matt Thode
2018-09-21 22:32 Matt Thode
2018-08-09 18:47 Matthias Maier
2018-06-26 19:51 Pacho Ramos
2018-04-07  3:05 Aaron Bauman
2018-03-26 19:18 Aaron Bauman
2018-03-16 15:35 Matt Thode
2018-01-05 20:45 Mike Gilbert
2017-10-05  4:10 Matt Thode
2017-10-04  2:30 Matt Thode
2017-09-30  1:03 Matt Thode
2017-08-24 19:31 Matt Thode
2017-07-24  0:12 Matt Thode
2017-07-24  0:12 Matt Thode
2017-07-24  0:12 Matt Thode
2017-07-07 11:40 Alexis Ballier
2017-04-23 21:01 David Seifert
2017-03-29  0:22 Matt Thode
2017-03-29  0:22 Matt Thode
2017-03-05  4:47 Matt Thode
2017-03-05  4:47 Matt Thode
2017-03-05  4:41 Matt Thode
2017-01-20 10:34 Sven Wegener
2017-01-08 22:34 Matt Thode
2016-12-03 21:34 Justin Lecher
2016-12-03 19:11 Justin Lecher
2016-11-10 21:26 Matt Thode
2016-11-09 22:25 Matt Thode
2016-10-05 16:56 David Seifert
2016-10-05 13:24 Matt Thode
2016-10-05  0:17 Matt Thode
2016-10-04 20:19 Matt Thode
2016-08-09 19:26 Matt Thode
2016-06-03 23:51 Matt Thode
2016-03-16 18:08 Matt Thode
2016-03-16 18:04 Agostino Sarubbo
2016-03-16 18:03 Agostino Sarubbo
2016-03-16 17:07 Matt Thode
2015-09-15 18:38 Matt Thode

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1585244157.8c149763968b822c158261806a3b208881ec1fb3.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox