x11-misc/synergy: Version bump.

	- add net-misc/curl dependency for syntool
	- Hack around false gtest dependency
	- Split out internal gtest/gmock patch

Package-Manager: portage-2.3.0

4 files changed, 186 insertions, 0 deletions

diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 89d555a42414..20f124a783e2 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.7.5.tar.gz 13668296 SHA256 b50c79f5c8aca2048cb0e11ba37f75722d1acdda23b0352e25ad66aff999f192 SHA512 f6124509944b8fd2feb048fae88c723f8c3f9ca4f7fa514bfd48ab0324810d7851d9e670c668a333d8b5df636732349c7a486fa329c333ee4569d6b9b43b6084 WHIRLPOOL 4738659578f72c439b6994bab52f7f492f2057fe09783eb91444992eb70bd22e69b553d111832bbdd75b7ed9e01b284b45d8879d714f5ad7b31047065bcaf011
 DIST synergy-1.7.6.tar.gz 13668433 SHA256 a453b880606edbdaec82576bcb74189a7ae564feeee126b125063802a778411d SHA512 025305fc1aca425b27c1d4f16dd0c6ee7798c048e234c8a27272b81b03c0c1cb35fab6639707c1b55d58e7676fe2abf058b6f93e994ae5b256034c32c6fe806a WHIRLPOOL ef83b94d8b3b0d3fb5dd2efcf6702f46b25915e4e240d22b9794b0fc6d7c32d883ede2c62fdbaab9fb1b62aa1606ed2ac73cf07544550398beedb3ceaba4a75c
+DIST synergy-1.8.1.tar.gz 13676205 SHA256 021792533beb4b5d78b7f449341f491f004e9cc823795e423dedf1c41c4c30d7 SHA512 f535cd14be1104a39150bfeb22c202aa4d6ab1f5b6cb4e1d4084284e3b62ceab7fc9bb2e87bf11a843f9030cccec22b0ff1669930cf259a4dddb13422f9d0b90 WHIRLPOOL 5d71b77edaa4c46fb338858a8b2c1d993c53bbd1d819b8010e37d6526a8f26f93af8c803c6838cd2f01d89b4532191a71ceb7aaac1bf6af2beb1e28df60eef90
 DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
diff --git a/x11-misc/synergy/files/synergy-1.8.1-gtest.patch b/x11-misc/synergy/files/synergy-1.8.1-gtest.patch
new file mode 100644
index 000000000000..3491077a15a1
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.8.1-gtest.patch
@@ -0,0 +1,38 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -19,6 +19,6 @@
+ add_subdirectory(plugin)
+ add_subdirectory(micro)
+ 
+-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
++if (${WITH_GENTOO_TEST})
+	add_subdirectory(test)
+ endif()
+--- a/src/lib/synergy/SubscriptionManager.h
++++ b/src/lib/synergy/SubscriptionManager.h
+@@ -20,7 +20,9 @@
+ #include "SubscriptionKey.h"
+ #include "common/common.h"
+ 
++#if WITH_GENTOO_TEST
+ #include "gtest/gtest_prod.h"
++#endif
+ 
+ class SubscriptionManager {
+ public:
+@@ -35,6 +37,7 @@
+ 	//! Use standard output to return subscription filename to gui
+ 	void				printFilename();
+ 
++#if WITH_GENTOO_TEST
+ private:
+ 	FRIEND_TEST(SubscriptionTests, decode_invalidLength_throwException);
+ 	FRIEND_TEST(SubscriptionTests, decode_invalidSerial_outputPlainText);
+@@ -45,6 +48,7 @@
+ 	FRIEND_TEST(SubscriptionTests, parsePlainSerial_expiredTrialSerial_throwException);
+ 	FRIEND_TEST(SubscriptionTests, parsePlainSerial_expiredBasicSerial_validSubscriptionKey);
+ 	FRIEND_TEST(SubscriptionTests, parsePlainSerial_validSerialWithoutCompany_validSubscriptionKey);
++#endif
+ 
+ private:
+ 	String				decode(const String& input);
diff --git a/x11-misc/synergy/files/synergy-1.8.1-internal-gmock-gtest.patch b/x11-misc/synergy/files/synergy-1.8.1-internal-gmock-gtest.patch
new file mode 100644
index 000000000000..7814c7418cd3
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.8.1-internal-gmock-gtest.patch
@@ -0,0 +1,23 @@
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -14,20 +14,5 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-include_directories(
+-	../../ext/gtest-1.6.0
+-	../../ext/gtest-1.6.0/include
+-	../../ext/gmock-1.6.0
+-	../../ext/gmock-1.6.0/include)
+-	
+-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc)
+-
+-if (UNIX)
+-	# ignore warnings in gtest and gmock
+-	set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
+-	set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
+-endif()
+-
+ add_subdirectory(integtests)
+ add_subdirectory(unittests)
diff --git a/x11-misc/synergy/synergy-1.8.1.ebuild b/x11-misc/synergy/synergy-1.8.1.ebuild
new file mode 100644
index 000000000000..a5fab9d32852
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.8.1.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/~hasufell/distfiles/${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.1-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
+}