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: media-video/syncplay/
Date: Thu, 26 Mar 2020 17:36:21 +0000 (UTC)	[thread overview]
Message-ID: <1585244154.7355f55482fc1182c2c72a4999d8106b781c5f75.mgorny@gentoo> (raw)

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}"


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

Thread overview: 11+ 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 --
2020-04-27  8:03 [gentoo-commits] repo/gentoo:master commit in: media-video/syncplay/ Mikle Kolyada
2018-08-26 11:51 Michał Górny
2018-05-20  0:16 Aaron Bauman
2018-04-23 14:50 Aaron Bauman
2018-01-30 22:19 Patrice Clement
2018-01-30 22:19 Patrice Clement
2017-11-22 23:07 Patrice Clement
2017-11-20 14:11 Manuel Rüger
2017-10-26 18:54 Thomas Deutschmann
2017-05-30 21:25 Patrice Clement

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=1585244154.7355f55482fc1182c2c72a4999d8106b781c5f75.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