x11-misc/synergy: version bump

Gentoo-Bug: 598802

Package-Manager: portage-2.3.2

3 files changed, 163 insertions, 0 deletions

diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 186c929d9036..2460d431fac3 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,4 +1,5 @@
 DIST synergy-1.6.3.tar.gz 4405517 SHA256 93b1965b8e0cfc55cc654aab7053a58b9e730d09e68bbc520be32353a01dce1a SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165 WHIRLPOOL cb8737f0fe75105c9f5c8c371a5aef55c5eb8f1c419b3a7315ed66880e79c379efc6d7bced20c0d046bc281be935322def54f98d67e383d7236620a948ae1c14
 DIST synergy-1.8.1.tar.gz 13676205 SHA256 021792533beb4b5d78b7f449341f491f004e9cc823795e423dedf1c41c4c30d7 SHA512 f535cd14be1104a39150bfeb22c202aa4d6ab1f5b6cb4e1d4084284e3b62ceab7fc9bb2e87bf11a843f9030cccec22b0ff1669930cf259a4dddb13422f9d0b90 WHIRLPOOL 5d71b77edaa4c46fb338858a8b2c1d993c53bbd1d819b8010e37d6526a8f26f93af8c803c6838cd2f01d89b4532191a71ceb7aaac1bf6af2beb1e28df60eef90
 DIST synergy-1.8.2.tar.gz 13500982 SHA256 2f84c718636f02acca4801fff30bd67f5bb2720304f7ab095f2112536da5a9fa SHA512 48d7e18e92f239feddc7afd31b5614c2c27b7dc1cb30e58aa168095771a85d87c9c621daaef6ee0126381bcdcfa515d484545d763d0b1c5e6c181e0e5175639c WHIRLPOOL 7ea3b3a9ab0b2ff861ecc8bba0b8f0d4c4145d24c8cbbd04e8800c731ab79ff9f6fb87f9b5d232995d2ffe331987c4214bc60711b61a4aad6e944abe4499f85c
+DIST synergy-1.8.5.tar.gz 13499654 SHA256 d913005e911bb6e5aa459f88fe91b40d59c37ea7207399814e4d450fd8634ec1 SHA512 bf751264d134dc1d171ed40499d29ee82d3bfdb4e5905543b35e586d4393c607cbb1260a1fd68b46bfe8c98adc392401c8ba05c587977bc678f2bb602703721d WHIRLPOOL a65217746d656b07c633366083cb652e040e215b52ae071721164176919f2e09ea98008ef0be5c3d8f3399dbd4d7598a93347b10c21b646be3b33fdd1e537219
 DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
diff --git a/x11-misc/synergy/files/synergy-1.8.5-gtest.patch b/x11-misc/synergy/files/synergy-1.8.5-gtest.patch
new file mode 100644
index 000000000000..c9eaa5164190
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.8.5-gtest.patch
@@ -0,0 +1,38 @@
+--- a/src/lib/synergy/KeyMap.h	2016-11-09 13:21:52.000000000 -0600
++++ b/src/lib/synergy/KeyMap.h	2016-11-09 13:22:17.484457330 -0600
+@@ -24,7 +24,9 @@
+ #include "common/stdset.h"
+ #include "common/stdvector.h"
+ 
++#if WITH_GENTOO_TEST
+ #include "gtest/gtest_prod.h"
++#endif
+ 
+ namespace synergy {
+ 
+@@ -327,6 +329,7 @@
+ 	//@}
+ 
+ 
++#if WITH_GENTOO_TEST
+ private:
+ 	FRIEND_TEST(KeyMapTests,
+ 				findBestKey_requiredDown_matchExactFirstItem);
+@@ -341,6 +344,7 @@
+ 	FRIEND_TEST(KeyMapTests,
+ 				findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
+ 	FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
++#endif
+ 
+ private:
+ 	//! Ways to synthesize a key
+--- a/src/CMakeLists.txt	2016-11-09 13:31:26.000000000 -0600
++++ b/src/CMakeLists.txt	2016-11-09 13:40:08.189421727 -0600
+@@ -50,6 +50,6 @@
+ add_subdirectory(cmd)
+ add_subdirectory(micro)
+ 
+-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
++if (${WITH_GENTOO_TEST})
+ 	add_subdirectory(test)
+ endif()
diff --git a/x11-misc/synergy/synergy-1.8.5.ebuild b/x11-misc/synergy/synergy-1.8.5.ebuild
new file mode 100644
index 000000000000..07490489f508
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.8.5.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="http://synergy-project.org/ https://github.com/symless/synergy"
+SRC_URI="
+	https://github.com/symless/${PN}/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~jer/${PN}.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="libressl qt4 test"
+
+S=${WORKDIR}/${P}-stable
+
+COMMON_DEPEND="
+	!libressl? ( dev-libs/openssl:* )
+	libressl? ( dev-libs/libressl )
+	net-misc/curl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( >=dev-cpp/gmock-1.6.0 )
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	qt4? ( !x11-misc/qsynergy )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.16_p1969-pthread.patch
+	"${FILESDIR}"/${PN}-1.7.5-gentoo.patch
+	"${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch
+	"${FILESDIR}"/${PN}-1.8.5-gtest.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"$(usex test -DWITH_GENTOO_TEST=1 -DWITH_GENTOO_TEST=0)"
+	)
+	append-cxxflags ${mycmakeargs}
+
+	cmake-utils_src_configure
+
+	if use qt4 ; then
+		cd src/gui || die
+		qt4-r2_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use qt4 ; then
+		cd src/gui || die
+		qt4-r2_src_compile
+	fi
+}
+
+src_test() {
+	local exe fail
+	for exe in bin/integtests bin/unittests; do
+		${exe} || fail+=" ${exe}"
+	done
+	[[ ${fail} ]] && ewarn "${fail} failed"
+}
+
+src_install () {
+	dobin bin/${PN}{c,s} bin/syntool
+
+	if use qt4 ; then
+		newbin bin/${PN} qsynergy
+		newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png
+		make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
+	fi
+
+	insinto /etc
+	newins doc/synergy.conf.example synergy.conf
+
+	newman doc/${PN}c.man ${PN}c.1
+	newman doc/${PN}s.man ${PN}s.1
+
+	dodoc README doc/synergy.conf.example* ChangeLog
+}
+
+pkg_preinst() {
+	use qt4 && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use qt4 && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use qt4 && gnome2_icon_cache_update
+}