| 1 |
commit: 1e3e746bce040eb291fdb07f788a5e6ac9a16aa9 |
| 2 |
Author: Mykyta Holubakha <hilobakho <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Jan 30 23:31:53 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 31 17:17:59 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3e746b |
| 7 |
|
| 8 |
media-video/syncplay: version bump to 1.4.0 |
| 9 |
|
| 10 |
properly disable GUI when use is unset (prevents error messags) |
| 11 |
|
| 12 |
update twisted dep |
| 13 |
|
| 14 |
Gentoo-Bug: http://bugs.gentoo.org/605098 |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/3234 |
| 16 |
|
| 17 |
media-video/syncplay/Manifest | 2 +- |
| 18 |
.../files/syncplay-1.4.0-rc2-fix-makefile.patch | 82 ---------------------- |
| 19 |
...play-1.4.0_rc2.ebuild => syncplay-1.4.0.ebuild} | 16 ++++- |
| 20 |
3 files changed, 14 insertions(+), 86 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest |
| 23 |
index eae7926..8111250 100644 |
| 24 |
--- a/media-video/syncplay/Manifest |
| 25 |
+++ b/media-video/syncplay/Manifest |
| 26 |
@@ -1 +1 @@ |
| 27 |
-DIST syncplay-1.4.0_rc2.tar.gz 534450 SHA256 29bd80ef3de7241eee71d0b9d7884c1c694a490d83acc96e3f06b05f419d5409 SHA512 56e5873377eceec1e88741464ff32f55899fe240d479a61c54af62f7cc4e1386a9b478b9b9057df0960cdb6833fce0e8efbe0aa0081211daa76fb95d2714b9bd WHIRLPOOL a61deba5ee1f613a5657e49c1c56f66b750611cf717ad00ffc3cc798d35d500d76a165d48a5b4e64b27619d8baeb5fe08ea30ebccf82d16aa43346df3fe58f61 |
| 28 |
+DIST syncplay-1.4.0.tar.gz 539743 SHA256 37fc2b3d1d6d49e2289dcdeffcf24ebdafbc24398411cff4666e09d49405759d SHA512 2266ffafe3b15730a43e3ddd8aa24e99c65ce5a4e95d05bcac745262d310cb846c84c6e5bb061ebb96e89faa0f10e22aacee286db6cbe53cd5f521cb2e5eee1a WHIRLPOOL 68ea8b437c379e2a049efbb9a4258c9d85bdb2d26841ed1100ee7a0083b4e66687bf21826daffd12102acb236b9bede9037f63ead0eba67dbbc5142db309d183 |
| 29 |
|
| 30 |
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 |
| 31 |
deleted file mode 100644 |
| 32 |
index b72d42b..00000000 |
| 33 |
--- a/media-video/syncplay/files/syncplay-1.4.0-rc2-fix-makefile.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,82 +0,0 @@ |
| 36 |
-From ee191c79d96436a379e3c6760cb4478dca262c9f Mon Sep 17 00:00:00 2001 |
| 37 |
-From: Mykyta Holubakha <hilobakho@×××××.com> |
| 38 |
-Date: Sat, 3 Sep 2016 18:50:18 +0300 |
| 39 |
-Subject: [PATCH] Support for DESTDIR and PREFIX |
| 40 |
- |
| 41 |
-Fixes #110 |
| 42 |
---- |
| 43 |
- GNUmakefile | 28 ++++++++++++++-------------- |
| 44 |
- 1 file changed, 14 insertions(+), 14 deletions(-) |
| 45 |
- |
| 46 |
-diff --git a/GNUmakefile b/GNUmakefile |
| 47 |
-index c52c09a..725e70e 100644 |
| 48 |
---- a/GNUmakefile |
| 49 |
-+++ b/GNUmakefile |
| 50 |
-@@ -19,21 +19,21 @@ endif |
| 51 |
- |
| 52 |
- ifeq ($(SINGLE_USER),false) |
| 53 |
- ifneq ($(BSD),true) |
| 54 |
-- BASE_PATH = /usr |
| 55 |
-- VLC_LIB_PATH = ${PREFIX}/usr/lib |
| 56 |
-+ PREFIX ?= /usr |
| 57 |
-+ VLC_LIB_PATH = ${PREFIX}/lib |
| 58 |
- else |
| 59 |
-- BASE_PATH = /usr/local |
| 60 |
-- VLC_LIB_PATH = ${PREFIX}/usr/local/lib |
| 61 |
-+ PREFIX ?= /usr/local |
| 62 |
-+ VLC_LIB_PATH = ${PREFIX}/lib |
| 63 |
- endif |
| 64 |
- else |
| 65 |
-- BASE_PATH = ${HOME}/.local |
| 66 |
-+ PREFIX = ${HOME}/.local |
| 67 |
- VLC_LIB_PATH = ${HOME}/.local/share |
| 68 |
- endif |
| 69 |
- |
| 70 |
-- BIN_PATH = ${PREFIX}$(BASE_PATH)/bin |
| 71 |
-- LIB_PATH = ${PREFIX}$(BASE_PATH)/lib |
| 72 |
-- APP_SHORTCUT_PATH = ${PREFIX}$(BASE_PATH)/share/applications |
| 73 |
-- SHARE_PATH = ${PREFIX}$(BASE_PATH)/share |
| 74 |
-+ BIN_PATH = ${DESTDIR}${PREFIX}/bin |
| 75 |
-+ LIB_PATH = ${DESTDIR}${PREFIX}/lib |
| 76 |
-+ APP_SHORTCUT_PATH = ${DESTDIR}${PREFIX}/share/applications |
| 77 |
-+ SHARE_PATH = ${DESTDIR}${PREFIX}/share |
| 78 |
- |
| 79 |
- common: |
| 80 |
- -mkdir -p $(LIB_PATH)/syncplay/resources/lua/intf |
| 81 |
-@@ -57,7 +57,7 @@ u-common: |
| 82 |
- client: |
| 83 |
- -mkdir -p $(BIN_PATH) |
| 84 |
- cp syncplayClient.py $(BIN_PATH)/syncplay |
| 85 |
-- sed -i -e 's%# libpath%site.addsitedir\("$(BASE_PATH)/lib/syncplay"\)%' $(BIN_PATH)/syncplay |
| 86 |
-+ sed -i -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' $(BIN_PATH)/syncplay |
| 87 |
- chmod 755 $(BIN_PATH)/syncplay |
| 88 |
- cp syncplayClient.py $(LIB_PATH)/syncplay/ |
| 89 |
- cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/ |
| 90 |
-@@ -67,20 +67,20 @@ ifeq ($(SINGLE_USER),false) |
| 91 |
- endif |
| 92 |
- |
| 93 |
- ifeq ($(VLC_SUPPORT),true) |
| 94 |
-- -mkdir -p $(VLC_LIB_PATH)/vlc/lua/intf/ |
| 95 |
-- cp resources/lua/intf/syncplay.lua $(VLC_LIB_PATH)/vlc/lua/intf/ |
| 96 |
-+ -mkdir -p ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/ |
| 97 |
-+ cp resources/lua/intf/syncplay.lua ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/ |
| 98 |
- endif |
| 99 |
- |
| 100 |
- u-client: |
| 101 |
- -rm $(BIN_PATH)/syncplay |
| 102 |
- -rm $(LIB_PATH)/syncplay/syncplayClient.py |
| 103 |
-- -rm $(VLC_LIB_PATH)/vlc/lua/intf/syncplay.lua |
| 104 |
-+ -rm ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/syncplay.lua |
| 105 |
- -rm $(APP_SHORTCUT_PATH)/syncplay.desktop |
| 106 |
- |
| 107 |
- server: |
| 108 |
- -mkdir -p $(BIN_PATH) |
| 109 |
- cp syncplayServer.py $(BIN_PATH)/syncplay-server |
| 110 |
-- sed -i -e 's%# libpath%site.addsitedir\("$(BASE_PATH)/lib/syncplay"\)%' $(BIN_PATH)/syncplay-server |
| 111 |
-+ sed -i -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' $(BIN_PATH)/syncplay-server |
| 112 |
- chmod 755 $(BIN_PATH)/syncplay-server |
| 113 |
- cp syncplayServer.py $(LIB_PATH)/syncplay/ |
| 114 |
- cp resources/syncplay-server.desktop $(APP_SHORTCUT_PATH)/ |
| 115 |
--- |
| 116 |
-2.9.3 |
| 117 |
- |
| 118 |
|
| 119 |
diff --git a/media-video/syncplay/syncplay-1.4.0_rc2.ebuild b/media-video/syncplay/syncplay-1.4.0.ebuild |
| 120 |
similarity index 75% |
| 121 |
rename from media-video/syncplay/syncplay-1.4.0_rc2.ebuild |
| 122 |
rename to media-video/syncplay/syncplay-1.4.0.ebuild |
| 123 |
index 5d6e730..ad59cf4 100644 |
| 124 |
--- a/media-video/syncplay/syncplay-1.4.0_rc2.ebuild |
| 125 |
+++ b/media-video/syncplay/syncplay-1.4.0.ebuild |
| 126 |
@@ -1,4 +1,4 @@ |
| 127 |
-# Copyright 1999-2016 Gentoo Foundation |
| 128 |
+# Copyright 1999-2017 Gentoo Foundation |
| 129 |
# Distributed under the terms of the GNU General Public License v2 |
| 130 |
# $Id$ |
| 131 |
|
| 132 |
@@ -24,13 +24,23 @@ REQUIRED_USE="vlc? ( client ) |
| 133 |
|
| 134 |
DEPEND="" |
| 135 |
RDEPEND="${PYTHON_DEPS} |
| 136 |
- dev-python/twisted-core[${PYTHON_USEDEP}] |
| 137 |
+ || ( |
| 138 |
+ >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 139 |
+ dev-python/twisted-core[${PYTHON_USEDEP}] |
| 140 |
+ ) |
| 141 |
gui? ( dev-python/pyside[${PYTHON_USEDEP}] ) |
| 142 |
vlc? ( media-video/vlc[lua] )" |
| 143 |
|
| 144 |
S="${WORKDIR}/${PN}-${MY_PV}" |
| 145 |
|
| 146 |
-PATCHES=( "${FILESDIR}/syncplay-1.4.0-rc2-fix-makefile.patch" ) |
| 147 |
+src_prepare() { |
| 148 |
+ default |
| 149 |
+ if ! use gui; then |
| 150 |
+ sed -i 's/"noGui": False,/"noGui": True,/' \ |
| 151 |
+ syncplay/ui/ConfigurationGetter.py \ |
| 152 |
+ || die "Failed to patch ConfigurationGetter.py" |
| 153 |
+ fi |
| 154 |
+} |
| 155 |
|
| 156 |
src_compile() { |
| 157 |
: |
Archives