Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 129 insertions, 6 deletions

diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog
index 2c3795ef2ecf..d5d06ff7ead0 100644
--- a/x11-misc/synergy/ChangeLog
+++ b/x11-misc/synergy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/synergy
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.122 2014/12/04 07:53:39 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.123 2015/03/09 11:15:41 jer Exp $
+
+*synergy-1.7.0 (09 Mar 2015)
+
+  09 Mar 2015; Jeroen Roovers <jer@gentoo.org> +synergy-1.7.0.ebuild:
+  Version bump.
 
 *synergy-1.6.2 (04 Dec 2014)
 
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index da8a558a686a..53028cc9d4d4 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -12,18 +12,20 @@ DIST synergy-1.5.0-r2278-Source.tar.gz 4350894 SHA256 66bf6016a2e71b2b2b26fc445d
 DIST synergy-1.5.1-r2398-Source.tar.gz 4350720 SHA256 c70cc5bbec47ea22bdc34107a1788cc37143c0fd8d8c4affba4f0257c26408a7 SHA512 793d502955a035b9032713ffbfa136328994f03a8d84000de1f062c56ce172d6e8667243a3aa728d9646760c5d54a56d9a1b75f7ea11e7e28b50e2793d6db633 WHIRLPOOL 7f9d893a0d2cfa8c5aeab948f22ad5730507b7007bf013b0916b36b392859b328a635dd7d7e196246cd634c6de410235d0e38037d860b00856d86128c47801a0
 DIST synergy-1.6.1.tar.gz 4404494 SHA256 7cd07198f70511f8555bf6e4520c118522a89b4ab6c6af96f1547f254bba0257 SHA512 b71102ca1e6f9bbcaf4b904287cdbaa73bfa18dc1ab54fb3e01a8ea23ba508e4e49924ba1cd2c76805882cafd059bac406509508171981c0a9b91e5711f1960a WHIRLPOOL 4dd17cdbe0fb9b7ebb6d5630528894c94c56930aac1c5eafe34833e56517fe687da31f65648fc804dfb03214a366c605a16ad3f0fce805aabac69372393ccf7b
 DIST synergy-1.6.2.tar.gz 4411385 SHA256 36c0a2c9ea1c3a13a6134ce1e76ad8dd2f442100dd6075c53f31b399d2543ba3 SHA512 197b399a96177ab8f493bdea439dffb1d153d120fc102dd66518681c5af7ec35f526f4c8a76efad36fe46f6fd9d332feb0d38ae969d5fd2bb6653fd8731ff11e WHIRLPOOL 76c9684489e7f9d42d2d1685e248ce3d57693b0c57dd5cd7cf8e0d827982c13546f00bfcbe4f7e88082c67659c69e5a841f640bb66a07560ac11d467095f60f4
+DIST synergy-1.7.0.tar.gz 8990045 SHA256 7f51c0e8ed76aec7fb14a02592248e807cb068913e154abf4ce7e326053ef4c0 SHA512 29c8c2f4d4784a45503332684f9217483f40df0ee4ee371e80411a21679234c7d34a4ada73fd4ba2218b39a9976943e8eed082152e7ef353eafeeea6bed73363 WHIRLPOOL 082944bbdc0571a1fd8c61db5c8f92b17e0f5266481b8187781d6590473c801b43b2dc08fd845876bc7ad8660a8bb739cb9347cec3d455d36230f91f58897721
 DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
 EBUILD synergy-1.4.16_p1969.ebuild 2032 SHA256 ee2d96126510629a752fb3757df4808ff1c9c774e7d8483d5e3704f28d907240 SHA512 1212ff942fc22931f8cfe143141e21cd4e6d31850b121add5cbf10194a9cbe9ef6f4efd2697660323ec127f04301bdb7fb9a0d0e634c08626eccf8709ad66b20 WHIRLPOOL 16cd8ec3f2c46a88ae1ff703f66b0743a14ecb04dc004f25a98e6006f6d4d116912b1f3d5c3417a7f419d52c8ceb9154a42f2c4480dd4445dc9b036abd36ed43
 EBUILD synergy-1.5.0_p2278.ebuild 2489 SHA256 0f2168503733b6e1c93a179ccedae4998344a03b33327b958a8aeab405f8728a SHA512 e49636986f744fadbd5ad280f32fa052ae813417c43f671064db4c92f24f68eb7f469632b1eec70e80c2dcdb1003e8db3336b318841daba9be0bc60c605cda3f WHIRLPOOL 80d191259031c9ce16a3f5a180456a5d40cc830f8f04ee7dd21e63509024e3fd9d530daaa3663c274cac06123b239dda7b364a51e91c9a06d175c8eab8f4a037
 EBUILD synergy-1.5.1_p2398.ebuild 2489 SHA256 50639c2682a958d11a0918f74b8b1e63b9ec654fc51ae012db30456f78871b54 SHA512 97bcf3df8adf1e1c91b104ab31020c8002c73ab12fdec2ffdaa95bf54d7e72868e3ae29df0595da0f42aa330eb5375720c01e6e4cefbf967fbe70c5e36a6cafb WHIRLPOOL 96c348eb25fcc07ede494617ce1fb262e5f90792ca06ecf20414704be64f6b464b195a2cc207abf715c7a10bd5ffcf0bf558aff783ee244e84ed39bbbd134e1a
 EBUILD synergy-1.6.1.ebuild 2546 SHA256 77f7d1f938aa664415d058671104830602e854dfd90f645a690630378ee1226c SHA512 3f77bf471cafc5e5310a935c99efa1c98bc2d6fa6c754900bf0f707e3631b4f0fd3839e4979d514c8fa81b0d267ac3069ecee740ffdbf1d5b5f4e8943519fd25 WHIRLPOOL facf6a59ee9d7490f90966b87ac309c7795364f406955c424b0d73571ee88a57263211a6fc084627b00883bfecb78f7878342982393966696417ef35a343190c
 EBUILD synergy-1.6.2.ebuild 2546 SHA256 a41f87c18212f748e128807dc0caa64c19c28ba6bd25e4003f398863083a9ae7 SHA512 f9c7d892f03b414988d2d07fb9d865a07089927b50295848de78860a367536b55fe24b12f2bd2346c28caf26a7dcaa917be36e8f7fb477194f9892e7e768d200 WHIRLPOOL dbbc7f9b8d506ee581e08120323157dab2542a10ab6409589eb6b38aaeac9bdc3b021b8dc785b6c67454bbcf57cb6f016282e71bf3743d3c81b32d4f04e94eb7
-MISC ChangeLog 17349 SHA256 525b45856caaa1fb62adbf666357c6ce7e145bc14dd37b9a9341386ca80a482a SHA512 53157ca73461176d798fc5df138283a24b1cced31f046ce8a8777f68c63b57807c01e2010ca10bce1718cfe24b8944df89c4a05175df3c5e25118620693eac9e WHIRLPOOL 142ff1e3a62c1c7be247e3917a2c6dba4119447e60f0e48ffb7b5917cdf889cdb52854b74d9d7ee00f1275d6c548279835045b4ad91e74557f9f89522373381e
+EBUILD synergy-1.7.0.ebuild 2497 SHA256 922d560517f004b38e2a0212e98cbffa4e25f833aa304d42389996b39abbb09c SHA512 e76e58f0e5da47681d9cba069ec24feddc504e96e7ce5542169e0030c4ddf1258734ee401993121ede2d8611d67f96255a57d082991b2fd405f4d31faf8a3c3b WHIRLPOOL c821630929a3399119ff28a62ce214894f563afef769b2f8a42516927773eeb10ab4eadc204b45988b0b1a75fc57a04380d0549449b76da50ad9ed25c4ab0cc3
+MISC ChangeLog 17466 SHA256 2d42360df50b1f585b77677d2d7e30728da01ecf5138aa27b7c8547b188de5ad SHA512 801c1a1221a212a7bf6b1bdb398c29d3eb2841a2fec448d842cadc3c158ad9bfc7e9bac31d1cce184e53527e24ec1321022dcc7ac58eb59326caa2ee60878f23 WHIRLPOOL 6bd9877bf07306561190308be7bedffa775077407559766d61591d20bd66363d13d9f6d6ad0f541f2946117eee706e3eea65388003e87cf3edec15009160d24a
 MISC metadata.xml 243 SHA256 16d6a09278140777930f22eeaf42238d2a5168e539c14f8fd7b1b2be1132539c SHA512 86dc9a5aecb9dfdabe223750574bb8469e4dd4fb89e3ea5b2a683de1f68c5829460c60d16d8a748c17f2b6daf3561d054aa5283f6a37c52a8a60fba6ebbfce14 WHIRLPOOL 9e7beb2b0a4715dcd6a1d9d22c0ce9f82b9871dabdb2693dc4f11589bb0a1aa807855fdfda2d415b0807f5e31c3e4ced43e97e2c761c967452e5bc1e52e81df5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSAEwQACgkQVWmRsqeSphMEwgCfcNih7PUA/F5u2LWQKAeNtjs1
-iz8An3zmDYfyXWl042974YWZoGhPF6mj
-=xRvJ
+iEYEAREIAAYFAlT9gN8ACgkQVWmRsqeSphPTcwCeKt4cWufCmlnDniAtdOZsmT8l
+7UgAnjHt/SE6czOpRKr2jiECgGFDrLrE
+=h83V
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/synergy/synergy-1.7.0.ebuild b/x11-misc/synergy/synergy-1.7.0.ebuild
new file mode 100644
index 000000000000..c76549b335fb
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.7.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.7.0.ebuild,v 1.1 2015/03/09 11:15:41 jer Exp $
+
+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/synergy/synergy"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://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="qt4 test"
+
+COMMON_DEPEND="
+	>=dev-libs/crypto++-5.6.2
+	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.4.17_p2055-test.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-gentoo.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-CSocketMultiplexer.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=$(cmake-utils_use_with test GENTOO_TEST)
+	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}
+
+	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
+}