media-video/syncplay: version bump to 1.4.0

properly disable GUI when use is unset (prevents error messags)

update twisted dep

Gentoo-Bug: http://bugs.gentoo.org/605098
Closes: https://github.com/gentoo/gentoo/pull/3234

diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest
index eae7926c1030a74e1a6e3f0a6968f747ac9c46d5..8111250cb43cd951008cc1cb32f0c461db82e1d0 100644 (file)
--- a/media-video/syncplay/Manifest
+++ b/media-video/syncplay/Manifest
@@ -1 +1 @@
-DIST syncplay-1.4.0_rc2.tar.gz 534450 SHA256 29bd80ef3de7241eee71d0b9d7884c1c694a490d83acc96e3f06b05f419d5409 SHA512 56e5873377eceec1e88741464ff32f55899fe240d479a61c54af62f7cc4e1386a9b478b9b9057df0960cdb6833fce0e8efbe0aa0081211daa76fb95d2714b9bd WHIRLPOOL a61deba5ee1f613a5657e49c1c56f66b750611cf717ad00ffc3cc798d35d500d76a165d48a5b4e64b27619d8baeb5fe08ea30ebccf82d16aa43346df3fe58f61
+DIST syncplay-1.4.0.tar.gz 539743 SHA256 37fc2b3d1d6d49e2289dcdeffcf24ebdafbc24398411cff4666e09d49405759d SHA512 2266ffafe3b15730a43e3ddd8aa24e99c65ce5a4e95d05bcac745262d310cb846c84c6e5bb061ebb96e89faa0f10e22aacee286db6cbe53cd5f521cb2e5eee1a WHIRLPOOL 68ea8b437c379e2a049efbb9a4258c9d85bdb2d26841ed1100ee7a0083b4e66687bf21826daffd12102acb236b9bede9037f63ead0eba67dbbc5142db309d183

diff --git a/media-video/syncplay/files/syncplay-1.4.0-rc2-fix-makefile.patch b/media-video/syncplay/files/syncplay-1.4.0-rc2-fix-makefile.patch
deleted file mode 100644 (file)
index b72d42b..0000000
--- a/media-video/syncplay/files/syncplay-1.4.0-rc2-fix-makefile.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From ee191c79d96436a379e3c6760cb4478dca262c9f Mon Sep 17 00:00:00 2001
-From: Mykyta Holubakha <hilobakho@gmail.com>
-Date: Sat, 3 Sep 2016 18:50:18 +0300
-Subject: [PATCH] Support for DESTDIR and PREFIX
-
-Fixes #110
----
- GNUmakefile | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/GNUmakefile b/GNUmakefile
-index c52c09a..725e70e 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -19,21 +19,21 @@ endif
- 
- ifeq ($(SINGLE_USER),false)
- ifneq ($(BSD),true)
--      BASE_PATH    = /usr
--      VLC_LIB_PATH = ${PREFIX}/usr/lib
-+      PREFIX      ?= /usr
-+      VLC_LIB_PATH = ${PREFIX}/lib
- else
--      BASE_PATH    = /usr/local
--      VLC_LIB_PATH = ${PREFIX}/usr/local/lib  
-+      PREFIX      ?= /usr/local
-+      VLC_LIB_PATH = ${PREFIX}/lib
- endif
- else
--      BASE_PATH    = ${HOME}/.local
-+      PREFIX       = ${HOME}/.local
-       VLC_LIB_PATH = ${HOME}/.local/share
- endif
- 
--      BIN_PATH          = ${PREFIX}$(BASE_PATH)/bin
--      LIB_PATH          = ${PREFIX}$(BASE_PATH)/lib
--      APP_SHORTCUT_PATH = ${PREFIX}$(BASE_PATH)/share/applications
--      SHARE_PATH        = ${PREFIX}$(BASE_PATH)/share
-+      BIN_PATH          = ${DESTDIR}${PREFIX}/bin
-+      LIB_PATH          = ${DESTDIR}${PREFIX}/lib
-+      APP_SHORTCUT_PATH = ${DESTDIR}${PREFIX}/share/applications
-+      SHARE_PATH        = ${DESTDIR}${PREFIX}/share
- 
- common:
-       -mkdir -p $(LIB_PATH)/syncplay/resources/lua/intf
-@@ -57,7 +57,7 @@ u-common:
- client:
-       -mkdir -p $(BIN_PATH)
-       cp syncplayClient.py $(BIN_PATH)/syncplay
--      sed -i -e 's%# libpath%site.addsitedir\("$(BASE_PATH)/lib/syncplay"\)%' $(BIN_PATH)/syncplay
-+      sed -i -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' $(BIN_PATH)/syncplay
-       chmod 755 $(BIN_PATH)/syncplay
-       cp syncplayClient.py $(LIB_PATH)/syncplay/
-       cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/
-@@ -67,20 +67,20 @@ ifeq ($(SINGLE_USER),false)
- endif
-       
- ifeq ($(VLC_SUPPORT),true)
--      -mkdir -p $(VLC_LIB_PATH)/vlc/lua/intf/
--      cp resources/lua/intf/syncplay.lua $(VLC_LIB_PATH)/vlc/lua/intf/
-+      -mkdir -p ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/
-+      cp resources/lua/intf/syncplay.lua ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/
- endif
- 
- u-client:
-       -rm $(BIN_PATH)/syncplay
-       -rm $(LIB_PATH)/syncplay/syncplayClient.py
--      -rm $(VLC_LIB_PATH)/vlc/lua/intf/syncplay.lua
-+      -rm ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/syncplay.lua
-       -rm $(APP_SHORTCUT_PATH)/syncplay.desktop
- 
- server:
-       -mkdir -p $(BIN_PATH)
-       cp syncplayServer.py $(BIN_PATH)/syncplay-server
--      sed -i -e 's%# libpath%site.addsitedir\("$(BASE_PATH)/lib/syncplay"\)%' $(BIN_PATH)/syncplay-server
-+      sed -i -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' $(BIN_PATH)/syncplay-server
-       chmod 755 $(BIN_PATH)/syncplay-server
-       cp syncplayServer.py $(LIB_PATH)/syncplay/
-       cp resources/syncplay-server.desktop $(APP_SHORTCUT_PATH)/
--- 
-2.9.3
-

diff --git a/media-video/syncplay/syncplay-1.4.0_rc2.ebuild b/media-video/syncplay/syncplay-1.4.0.ebuild
similarity index 75%
rename from media-video/syncplay/syncplay-1.4.0_rc2.ebuild
rename to media-video/syncplay/syncplay-1.4.0.ebuild
index 5d6e7300acd688b6cc023fd346c11fb26791bad2..ad59cf4d8d9a3f1f6f9d82aba08ca8f1bf28595a 100644 (file)
--- a/media-video/syncplay/syncplay-1.4.0_rc2.ebuild
+++ b/media-video/syncplay/syncplay-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,13 +24,23 @@ REQUIRED_USE="vlc? ( client )
 
 DEPEND=""
 RDEPEND="${PYTHON_DEPS}
-       dev-python/twisted-core[${PYTHON_USEDEP}]
+       || (
+               >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+               dev-python/twisted-core[${PYTHON_USEDEP}]
+       )
        gui? ( dev-python/pyside[${PYTHON_USEDEP}] )
        vlc? ( media-video/vlc[lua] )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-PATCHES=( "${FILESDIR}/syncplay-1.4.0-rc2-fix-makefile.patch" )
+src_prepare() {
+       default
+       if ! use gui; then
+               sed -i 's/"noGui": False,/"noGui": True,/' \
+                       syncplay/ui/ConfigurationGetter.py \
+               || die "Failed to patch ConfigurationGetter.py"
+       fi
+}
 
 src_compile() {
        :