From 7355f55482fc1182c2c72a4999d8106b781c5f75 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 26 Mar 2020 18:29:31 +0100 Subject: [PATCH] media-video/syncplay: Flatten twisted dep MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- 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 88c576cffbde..2300d465955e 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 55904564d23e..57714f0b4faf 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 ed87eb7ddfed..d1c1f6fabbbd 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}" -- 2.26.2