Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/files/, x11-misc/synergy/
Date: Tue, 07 Mar 2017 09:14:40
Message-Id: 1488877925.28620959cb1397c84eab88bda561815f91d26d27.soap@gentoo
1 commit: 28620959cb1397c84eab88bda561815f91d26d27
2 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
3 AuthorDate: Mon Mar 6 15:03:56 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 7 09:12:05 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28620959
7
8 x11-misc/synergy: Remove old
9
10 Package-Manager: Portage-2.3.4, Repoman-2.3.2
11 Closes: https://github.com/gentoo/gentoo/pull/4142
12
13 x11-misc/synergy/Manifest | 3 -
14 x11-misc/synergy/files/synergy-1.8.1-gtest.patch | 38 -------
15 x11-misc/synergy/synergy-1.8.1-r3.ebuild | 126 -----------------------
16 x11-misc/synergy/synergy-1.8.2.ebuild | 126 -----------------------
17 x11-misc/synergy/synergy-1.8.5.ebuild | 123 ----------------------
18 5 files changed, 416 deletions(-)
19
20 diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
21 index 493fea78c34..c273be9bbf3 100644
22 --- a/x11-misc/synergy/Manifest
23 +++ b/x11-misc/synergy/Manifest
24 @@ -1,6 +1,3 @@
25 DIST synergy-1.6.3.tar.gz 4405517 SHA256 93b1965b8e0cfc55cc654aab7053a58b9e730d09e68bbc520be32353a01dce1a SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165 WHIRLPOOL cb8737f0fe75105c9f5c8c371a5aef55c5eb8f1c419b3a7315ed66880e79c379efc6d7bced20c0d046bc281be935322def54f98d67e383d7236620a948ae1c14
26 -DIST synergy-1.8.1.tar.gz 13676205 SHA256 021792533beb4b5d78b7f449341f491f004e9cc823795e423dedf1c41c4c30d7 SHA512 f535cd14be1104a39150bfeb22c202aa4d6ab1f5b6cb4e1d4084284e3b62ceab7fc9bb2e87bf11a843f9030cccec22b0ff1669930cf259a4dddb13422f9d0b90 WHIRLPOOL 5d71b77edaa4c46fb338858a8b2c1d993c53bbd1d819b8010e37d6526a8f26f93af8c803c6838cd2f01d89b4532191a71ceb7aaac1bf6af2beb1e28df60eef90
27 -DIST synergy-1.8.2.tar.gz 13500982 SHA256 2f84c718636f02acca4801fff30bd67f5bb2720304f7ab095f2112536da5a9fa SHA512 48d7e18e92f239feddc7afd31b5614c2c27b7dc1cb30e58aa168095771a85d87c9c621daaef6ee0126381bcdcfa515d484545d763d0b1c5e6c181e0e5175639c WHIRLPOOL 7ea3b3a9ab0b2ff861ecc8bba0b8f0d4c4145d24c8cbbd04e8800c731ab79ff9f6fb87f9b5d232995d2ffe331987c4214bc60711b61a4aad6e944abe4499f85c
28 -DIST synergy-1.8.5.tar.gz 13499654 SHA256 d913005e911bb6e5aa459f88fe91b40d59c37ea7207399814e4d450fd8634ec1 SHA512 bf751264d134dc1d171ed40499d29ee82d3bfdb4e5905543b35e586d4393c607cbb1260a1fd68b46bfe8c98adc392401c8ba05c587977bc678f2bb602703721d WHIRLPOOL a65217746d656b07c633366083cb652e040e215b52ae071721164176919f2e09ea98008ef0be5c3d8f3399dbd4d7598a93347b10c21b646be3b33fdd1e537219
29 DIST synergy-1.8.6.tar.gz 13497043 SHA256 76b27c6e90961ee6bdad429904a2d5743854d0d027c067941d2411565d64352b SHA512 e0816c280c77d4a865f4b7d4a9081963032a156bfb6da51e6b67a6fc41f8f18b097d3fc7c96218db268c36d0148021f9ddba95fe56daff8bfc54219dbdfe14a5 WHIRLPOOL c12a0038f931963afee8190799dd74dcb300cbb79c2870d1a8a2e33238a86cc0ef30e5b577fdda05d7880e488d3c03da6a48c6a22095b2f4b312fc851325376a
30 DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
31
32 diff --git a/x11-misc/synergy/files/synergy-1.8.1-gtest.patch b/x11-misc/synergy/files/synergy-1.8.1-gtest.patch
33 deleted file mode 100644
34 index 3491077a15a..00000000000
35 --- a/x11-misc/synergy/files/synergy-1.8.1-gtest.patch
36 +++ /dev/null
37 @@ -1,38 +0,0 @@
38 ---- a/src/CMakeLists.txt
39 -+++ b/src/CMakeLists.txt
40 -@@ -19,6 +19,6 @@
41 - add_subdirectory(plugin)
42 - add_subdirectory(micro)
43 -
44 --if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
45 -+if (${WITH_GENTOO_TEST})
46 - add_subdirectory(test)
47 - endif()
48 ---- a/src/lib/synergy/SubscriptionManager.h
49 -+++ b/src/lib/synergy/SubscriptionManager.h
50 -@@ -20,7 +20,9 @@
51 - #include "SubscriptionKey.h"
52 - #include "common/common.h"
53 -
54 -+#if WITH_GENTOO_TEST
55 - #include "gtest/gtest_prod.h"
56 -+#endif
57 -
58 - class SubscriptionManager {
59 - public:
60 -@@ -35,6 +37,7 @@
61 - //! Use standard output to return subscription filename to gui
62 - void printFilename();
63 -
64 -+#if WITH_GENTOO_TEST
65 - private:
66 - FRIEND_TEST(SubscriptionTests, decode_invalidLength_throwException);
67 - FRIEND_TEST(SubscriptionTests, decode_invalidSerial_outputPlainText);
68 -@@ -45,6 +48,7 @@
69 - FRIEND_TEST(SubscriptionTests, parsePlainSerial_expiredTrialSerial_throwException);
70 - FRIEND_TEST(SubscriptionTests, parsePlainSerial_expiredBasicSerial_validSubscriptionKey);
71 - FRIEND_TEST(SubscriptionTests, parsePlainSerial_validSerialWithoutCompany_validSubscriptionKey);
72 -+#endif
73 -
74 - private:
75 - String decode(const String& input);
76
77 diff --git a/x11-misc/synergy/synergy-1.8.1-r3.ebuild b/x11-misc/synergy/synergy-1.8.1-r3.ebuild
78 deleted file mode 100644
79 index 74d155ef823..00000000000
80 --- a/x11-misc/synergy/synergy-1.8.1-r3.ebuild
81 +++ /dev/null
82 @@ -1,126 +0,0 @@
83 -# Copyright 1999-2017 Gentoo Foundation
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI=5
87 -inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
88 -
89 -DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
90 -HOMEPAGE="http://synergy-project.org/ https://github.com/symless/synergy"
91 -SRC_URI="
92 - https://github.com/symless/${PN}/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
93 - https://dev.gentoo.org/~jer/${PN}.png
94 -"
95 -
96 -LICENSE="GPL-2"
97 -SLOT="0"
98 -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
99 -IUSE="libressl qt4 test"
100 -
101 -S=${WORKDIR}/${P}-stable
102 -
103 -COMMON_DEPEND="
104 - !libressl? ( dev-libs/openssl:* )
105 - libressl? ( dev-libs/libressl )
106 - net-misc/curl
107 - x11-libs/libICE
108 - x11-libs/libSM
109 - x11-libs/libX11
110 - x11-libs/libXext
111 - x11-libs/libXi
112 - x11-libs/libXinerama
113 - x11-libs/libXrandr
114 - x11-libs/libXtst
115 - qt4? (
116 - dev-qt/qtcore:4
117 - dev-qt/qtgui:4
118 - net-dns/avahi[mdnsresponder-compat]
119 - )
120 -"
121 -DEPEND="
122 - ${COMMON_DEPEND}
123 - test? ( >=dev-cpp/gmock-1.6.0 )
124 - x11-proto/kbproto
125 - x11-proto/randrproto
126 - x11-proto/xextproto
127 - x11-proto/xineramaproto
128 - x11-proto/xproto
129 -"
130 -RDEPEND="
131 - ${COMMON_DEPEND}
132 - qt4? ( !x11-misc/qsynergy )
133 -"
134 -
135 -PATCHES=(
136 - "${FILESDIR}"/${PN}-1.4.16_p1969-pthread.patch
137 - "${FILESDIR}"/${PN}-1.7.5-gentoo.patch
138 - "${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch
139 - "${FILESDIR}"/${PN}-1.8.1-gtest.patch
140 -)
141 -
142 -src_prepare() {
143 - cmake-utils_src_prepare
144 -}
145 -
146 -src_configure() {
147 - local mycmakeargs=(
148 - "$(usex test -DWITH_GENTOO_TEST=1 -DWITH_GENTOO_TEST=0)"
149 - )
150 - append-cxxflags ${mycmakeargs}
151 -
152 - cmake-utils_src_configure
153 -
154 - if use qt4 ; then
155 - cd src/gui || die
156 - qt4-r2_src_configure
157 - fi
158 -}
159 -
160 -src_compile() {
161 - cmake-utils_src_compile
162 -
163 - if use qt4 ; then
164 - cd src/gui || die
165 - qt4-r2_src_compile
166 - fi
167 -}
168 -
169 -src_test() {
170 - local exe fail
171 - for exe in bin/integtests bin/unittests; do
172 - ${exe} || fail+=" ${exe}"
173 - done
174 - [[ ${fail} ]] && ewarn "${fail} failed"
175 -}
176 -
177 -src_install () {
178 - dobin bin/${PN}{c,s} bin/syntool
179 -
180 - exeinto /usr/$(get_libdir)/${PN}/plugins
181 - doexe bin/plugins/libns.so
182 -
183 - if use qt4 ; then
184 - newbin bin/${PN} qsynergy
185 - newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png
186 - make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
187 - fi
188 -
189 - insinto /etc
190 - newins doc/synergy.conf.example synergy.conf
191 -
192 - newman doc/${PN}c.man ${PN}c.1
193 - newman doc/${PN}s.man ${PN}s.1
194 -
195 - dodoc README doc/synergy.conf.example* ChangeLog
196 -}
197 -
198 -pkg_preinst() {
199 - use qt4 && gnome2_icon_savelist
200 -}
201 -
202 -pkg_postinst() {
203 - use qt4 && gnome2_icon_cache_update
204 -}
205 -
206 -pkg_postrm() {
207 - use qt4 && gnome2_icon_cache_update
208 -}
209
210 diff --git a/x11-misc/synergy/synergy-1.8.2.ebuild b/x11-misc/synergy/synergy-1.8.2.ebuild
211 deleted file mode 100644
212 index 74d155ef823..00000000000
213 --- a/x11-misc/synergy/synergy-1.8.2.ebuild
214 +++ /dev/null
215 @@ -1,126 +0,0 @@
216 -# Copyright 1999-2017 Gentoo Foundation
217 -# Distributed under the terms of the GNU General Public License v2
218 -
219 -EAPI=5
220 -inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
221 -
222 -DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
223 -HOMEPAGE="http://synergy-project.org/ https://github.com/symless/synergy"
224 -SRC_URI="
225 - https://github.com/symless/${PN}/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
226 - https://dev.gentoo.org/~jer/${PN}.png
227 -"
228 -
229 -LICENSE="GPL-2"
230 -SLOT="0"
231 -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
232 -IUSE="libressl qt4 test"
233 -
234 -S=${WORKDIR}/${P}-stable
235 -
236 -COMMON_DEPEND="
237 - !libressl? ( dev-libs/openssl:* )
238 - libressl? ( dev-libs/libressl )
239 - net-misc/curl
240 - x11-libs/libICE
241 - x11-libs/libSM
242 - x11-libs/libX11
243 - x11-libs/libXext
244 - x11-libs/libXi
245 - x11-libs/libXinerama
246 - x11-libs/libXrandr
247 - x11-libs/libXtst
248 - qt4? (
249 - dev-qt/qtcore:4
250 - dev-qt/qtgui:4
251 - net-dns/avahi[mdnsresponder-compat]
252 - )
253 -"
254 -DEPEND="
255 - ${COMMON_DEPEND}
256 - test? ( >=dev-cpp/gmock-1.6.0 )
257 - x11-proto/kbproto
258 - x11-proto/randrproto
259 - x11-proto/xextproto
260 - x11-proto/xineramaproto
261 - x11-proto/xproto
262 -"
263 -RDEPEND="
264 - ${COMMON_DEPEND}
265 - qt4? ( !x11-misc/qsynergy )
266 -"
267 -
268 -PATCHES=(
269 - "${FILESDIR}"/${PN}-1.4.16_p1969-pthread.patch
270 - "${FILESDIR}"/${PN}-1.7.5-gentoo.patch
271 - "${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch
272 - "${FILESDIR}"/${PN}-1.8.1-gtest.patch
273 -)
274 -
275 -src_prepare() {
276 - cmake-utils_src_prepare
277 -}
278 -
279 -src_configure() {
280 - local mycmakeargs=(
281 - "$(usex test -DWITH_GENTOO_TEST=1 -DWITH_GENTOO_TEST=0)"
282 - )
283 - append-cxxflags ${mycmakeargs}
284 -
285 - cmake-utils_src_configure
286 -
287 - if use qt4 ; then
288 - cd src/gui || die
289 - qt4-r2_src_configure
290 - fi
291 -}
292 -
293 -src_compile() {
294 - cmake-utils_src_compile
295 -
296 - if use qt4 ; then
297 - cd src/gui || die
298 - qt4-r2_src_compile
299 - fi
300 -}
301 -
302 -src_test() {
303 - local exe fail
304 - for exe in bin/integtests bin/unittests; do
305 - ${exe} || fail+=" ${exe}"
306 - done
307 - [[ ${fail} ]] && ewarn "${fail} failed"
308 -}
309 -
310 -src_install () {
311 - dobin bin/${PN}{c,s} bin/syntool
312 -
313 - exeinto /usr/$(get_libdir)/${PN}/plugins
314 - doexe bin/plugins/libns.so
315 -
316 - if use qt4 ; then
317 - newbin bin/${PN} qsynergy
318 - newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png
319 - make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
320 - fi
321 -
322 - insinto /etc
323 - newins doc/synergy.conf.example synergy.conf
324 -
325 - newman doc/${PN}c.man ${PN}c.1
326 - newman doc/${PN}s.man ${PN}s.1
327 -
328 - dodoc README doc/synergy.conf.example* ChangeLog
329 -}
330 -
331 -pkg_preinst() {
332 - use qt4 && gnome2_icon_savelist
333 -}
334 -
335 -pkg_postinst() {
336 - use qt4 && gnome2_icon_cache_update
337 -}
338 -
339 -pkg_postrm() {
340 - use qt4 && gnome2_icon_cache_update
341 -}
342
343 diff --git a/x11-misc/synergy/synergy-1.8.5.ebuild b/x11-misc/synergy/synergy-1.8.5.ebuild
344 deleted file mode 100644
345 index 51c84973290..00000000000
346 --- a/x11-misc/synergy/synergy-1.8.5.ebuild
347 +++ /dev/null
348 @@ -1,123 +0,0 @@
349 -# Copyright 1999-2017 Gentoo Foundation
350 -# Distributed under the terms of the GNU General Public License v2
351 -
352 -EAPI=5
353 -inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
354 -
355 -DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
356 -HOMEPAGE="http://synergy-project.org/ https://github.com/symless/synergy"
357 -SRC_URI="
358 - https://github.com/symless/${PN}/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
359 - https://dev.gentoo.org/~jer/${PN}.png
360 -"
361 -
362 -LICENSE="GPL-2"
363 -SLOT="0"
364 -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
365 -IUSE="libressl qt4 test"
366 -
367 -S=${WORKDIR}/${P}-stable
368 -
369 -COMMON_DEPEND="
370 - !libressl? ( dev-libs/openssl:* )
371 - libressl? ( dev-libs/libressl )
372 - net-misc/curl
373 - x11-libs/libICE
374 - x11-libs/libSM
375 - x11-libs/libX11
376 - x11-libs/libXext
377 - x11-libs/libXi
378 - x11-libs/libXinerama
379 - x11-libs/libXrandr
380 - x11-libs/libXtst
381 - qt4? (
382 - dev-qt/qtcore:4
383 - dev-qt/qtgui:4
384 - net-dns/avahi[mdnsresponder-compat]
385 - )
386 -"
387 -DEPEND="
388 - ${COMMON_DEPEND}
389 - test? ( >=dev-cpp/gmock-1.6.0 )
390 - x11-proto/kbproto
391 - x11-proto/randrproto
392 - x11-proto/xextproto
393 - x11-proto/xineramaproto
394 - x11-proto/xproto
395 -"
396 -RDEPEND="
397 - ${COMMON_DEPEND}
398 - qt4? ( !x11-misc/qsynergy )
399 -"
400 -
401 -PATCHES=(
402 - "${FILESDIR}"/${PN}-1.4.16_p1969-pthread.patch
403 - "${FILESDIR}"/${PN}-1.7.5-gentoo.patch
404 - "${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch
405 - "${FILESDIR}"/${PN}-1.8.5-gtest.patch
406 -)
407 -
408 -src_prepare() {
409 - cmake-utils_src_prepare
410 -}
411 -
412 -src_configure() {
413 - local mycmakeargs=(
414 - "$(usex test -DWITH_GENTOO_TEST=1 -DWITH_GENTOO_TEST=0)"
415 - )
416 - append-cxxflags ${mycmakeargs}
417 -
418 - cmake-utils_src_configure
419 -
420 - if use qt4 ; then
421 - cd src/gui || die
422 - qt4-r2_src_configure
423 - fi
424 -}
425 -
426 -src_compile() {
427 - cmake-utils_src_compile
428 -
429 - if use qt4 ; then
430 - cd src/gui || die
431 - qt4-r2_src_compile
432 - fi
433 -}
434 -
435 -src_test() {
436 - local exe fail
437 - for exe in bin/integtests bin/unittests; do
438 - ${exe} || fail+=" ${exe}"
439 - done
440 - [[ ${fail} ]] && ewarn "${fail} failed"
441 -}
442 -
443 -src_install () {
444 - dobin bin/${PN}{c,s} bin/syntool
445 -
446 - if use qt4 ; then
447 - newbin bin/${PN} qsynergy
448 - newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png
449 - make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
450 - fi
451 -
452 - insinto /etc
453 - newins doc/synergy.conf.example synergy.conf
454 -
455 - newman doc/${PN}c.man ${PN}c.1
456 - newman doc/${PN}s.man ${PN}s.1
457 -
458 - dodoc README doc/synergy.conf.example* ChangeLog
459 -}
460 -
461 -pkg_preinst() {
462 - use qt4 && gnome2_icon_savelist
463 -}
464 -
465 -pkg_postinst() {
466 - use qt4 && gnome2_icon_cache_update
467 -}
468 -
469 -pkg_postrm() {
470 - use qt4 && gnome2_icon_cache_update
471 -}