[gentoo-commits] repo/gentoo:master commit in: media-video/syncplay/

[Michał Górny]

commit:     7355f55482fc1182c2c72a4999d8106b781c5f75
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 17:29:31 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 17:35:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7355f554

media-video/syncplay: Flatten twisted dep

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

 media-video/syncplay/syncplay-1.5.0.ebuild | 7 ++-----
 media-video/syncplay/syncplay-1.5.1.ebuild | 7 ++-----
 media-video/syncplay/syncplay-9999.ebuild  | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/media-video/syncplay/syncplay-1.5.0.ebuild 
b/media-video/syncplay/syncplay-1.5.0.ebuild
index 88c576cffbd..2300d465955 100644
--- a/media-video/syncplay/syncplay-1.5.0.ebuild
+++ b/media-video/syncplay/syncplay-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,10 +22,7 @@ REQUIRED_USE="vlc? ( client )
 
 DEPEND=""
 RDEPEND="${PYTHON_DEPS}
-       || (
-               >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-               dev-python/twisted-core[${PYTHON_USEDEP}]
-       )
+       >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
        vlc? ( media-video/vlc[lua] )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"

diff --git a/media-video/syncplay/syncplay-1.5.1.ebuild 
b/media-video/syncplay/syncplay-1.5.1.ebuild
index 55904564d23..57714f0b4fa 100644
--- a/media-video/syncplay/syncplay-1.5.1.ebuild
+++ b/media-video/syncplay/syncplay-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,10 +22,7 @@ DEPEND=""
 # TODO: investigate the possibility of enabling PyQt5 gui
 # possible licensing concerns
 RDEPEND="${PYTHON_DEPS}
-       || (
-               >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-               dev-python/twisted-core[${PYTHON_USEDEP}]
-       )
+       >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
        vlc? ( media-video/vlc[lua] )"
 
 src_prepare() {

diff --git a/media-video/syncplay/syncplay-9999.ebuild 
b/media-video/syncplay/syncplay-9999.ebuild
index ed87eb7ddfe..d1c1f6fabbb 100644
--- a/media-video/syncplay/syncplay-9999.ebuild
+++ b/media-video/syncplay/syncplay-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,10 +21,7 @@ REQUIRED_USE="vlc? ( client )
 
 DEPEND=""
 RDEPEND="${PYTHON_DEPS}
-       || (
-               >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-               dev-python/twisted-core[${PYTHON_USEDEP}]
-       )
+       >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
        vlc? ( media-video/vlc[lua] )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"