Version bump from upstream with many, many bug fixes. Bug 430694 by Dustin C. Hatch

Package-Manager: portage-2.1.10.65/cvs/Linux i686

5 files changed, 26 insertions, 134 deletions

diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog
index b9c5b1563a99..c7846edacb12 100644
--- a/x11-misc/synergy/ChangeLog
+++ b/x11-misc/synergy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/synergy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.84 2012/07/19 15:59:54 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.85 2012/08/10 13:49:23 darkside Exp $
+
+*synergy-1.4.10 (10 Aug 2012)
+
+  10 Aug 2012; Jeremy Olexa <darkside@gentoo.org> -synergy-1.3.1.ebuild,
+  -synergy-1.3.6.ebuild, -synergy-1.4.2.ebuild, +synergy-1.4.10.ebuild:
+  Version bump from upstream with many, many bug fixes. Bug 430694 by Dustin C.
+  Hatch
 
   19 Jul 2012; Michael Palimaka <kensington@gentoo.org> synergy-1.4.2.ebuild,
   synergy-1.4.5-r2.ebuild, synergy-1.4.7.ebuild:
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index e2d83dac1395..0bfab5113986 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,31 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX synergy-1.3.1+gcc-4.3.patch 4463 SHA256 0dfcdedce8de2cf1285a7af30652eba7234d95d769f762774975ea4d0f293375 SHA512 2ad840b1eb57a1073d0b4996bc8c9a126ded00fcc8a53ded1a88026b35077695bf3101fe0fc1aed348ac5a5836c59a1d77282944f4ae4c301527f7a22c7f428c WHIRLPOOL e275a34c8301da2a58dc14eedc3ef8ef91332ebd1e5deaa98908f2ea48f497a337c4c3359c6315bef110d2675acbfa76b4ac104c6397659f2d59e0109a25d44a
 AUX synergy-1.3.1-infinite-timeout-fix.patch 548 SHA256 9038062a1e678ef858f161393332acdde9124beca45cedff9179582f33d20cca SHA512 7966716990ec0b82e90bb59d7ff2eeb5b1ce2bba52a6a667a063cccd4fec9f71a7624d4373231e0084e896defba2dc5d1093b5d29af1b446ec764d798fef366f WHIRLPOOL 98ed28e1ee43ae6a19b3fadbcbf15fc25930c724e15e49507301098e760c3a3b5ad93a97bc66e06bf8a55e7b7a68fd246739bec788dadc35192bc979f5635beb
 AUX synergy-1.3.1-stuttered-delay-fix.patch 2144 SHA256 4ffbbaea726e507e024d550459fb0ab25a9da70cb90245400e86d035bbd9a1b9 SHA512 143f603c13fa97c1688b8645a74d553df71398c36abf57ea340d1a3a9b165f26ab8cd59af5d7751bb05c72a5e67e98eb5bf904b738c9a7a2a905a5b489b14c2a WHIRLPOOL 512d9b8c94593575268bd94f3f6cab3444ca9806d58ee95b9d6eadc20be590873c44b15d958255bdc810dc6f3fada7c12a0bba6c209a578fc6f78e60bbabdcce
 AUX synergy-1.4.5-clipboard-fix.patch 14164 SHA256 26ee4b97ca1098836c3af499084ba08bc2b47ed533a01040f1509483c0b155e7 SHA512 6ee10772097ed6b30c727502e6e0562f12194ecff675c8701a2d7c99e16bcc69efc6b352713e9885650e3a6746c695be7beb2fb3adc852a819c81affe944112e WHIRLPOOL ba0bf111610c383d31ea8d0de044c445671f4b7c3be3b08709f2ec3bc2163f946680d825b3cdb2e583d3321a452cd00ec0bc01bcab4aaade29c3e0dae447d7e1
 AUX synergy-1.4.5-gtk3-fix.patch 6353 SHA256 795673183f1f8bb10aa8361613798e3e33dc229ce36295d4a642e875a849dda8 SHA512 deca5638c38042f73b47b6b939c370432f753806e8e5b3a803628a38b8d57cf81359377072aa64640ecc7c5207c1c9589c92e81d4875949ebdb2a8422332efb2 WHIRLPOOL 851247a90f4f39a48f1b35fb99552b4bda355dd271807b03ba982f87cd1375ffdba6f266e249deae8063105db74a32d2386b49b5c68e3567c195b8b39d57110d
-DIST synergy-1.3.1.tar.gz 793172 SHA256 4a15e26456498dda5f3aa7d688a4892e0c50394a2f01685136fbc954bacc9691
-DIST synergy-1.3.6-Source.tar.gz 659025 SHA256 b136fcd2795837c5c56050c32ab32e7305a84fd4ac8f3dd6458d3abc18179162
-DIST synergy-1.4.2-Source.tar.gz 868390 SHA256 eb277833db7e022b064588f64b78bfa36b555ae7aee1e5dd4dafb1c107bc1716
+DIST synergy-1.4.10-Source.tar.gz 3598533 SHA256 06d5a2ceb4cf8808cdab22441897c7b54ec8b4bc8351ac116f9accf54c720fbe SHA512 d8ebff1d53d16f6abb9cc64c7cd2ac5d6923b61ff3773f32d464cb58a0440bdbaa74836662d4c83e541516b4abda97f35855239cd12b6b095535fd38e36f238c WHIRLPOOL 86a8595403b5fb4efe88f4ea2cc528f541ea2cdb195254637ef077971ccc4cea3261d93fa2b8696fd39740a1421530c55099048399dbabe0e183f26da7a3c610
 DIST synergy-1.4.5-Source.tar.gz 3002836 SHA256 69e9ea11bdd05252886fe6a47fc43735bdc8a5af9dc2b843f4c34de1f0515ad1
 DIST synergy-1.4.7-Source.tar.gz 2998229 SHA256 e224d2ab822dc7b6e90a87587ed7d9e32f27d05efebc8430ecf61b3610baea3b
-EBUILD synergy-1.3.1.ebuild 1428 SHA256 7e19d250ee0273045edc4cf7f5e71ef1c72a100132a3242b4ff52b3d03071115 SHA512 d8214b541a5e8143671e58963955c336e5a8473ca8ffe47896fae5c650487819550524df0ee41b2552eb82bb7a6f2622a89b79bd24b8c0a160756a137122c3a2 WHIRLPOOL 65bf075bfe75f401ddbcf8ae6b063e021a5db2dd7d9c211f84debfd6ae48ef3aa8685ede8d16147fe4444ef6ff9084f6d7e0dabf98733d21064cf033dec23196
-EBUILD synergy-1.3.6.ebuild 1092 SHA256 96daf587b72f5c572359aa15fa44c91ad4026da10b4b739d415d748c85f35e1c SHA512 ffafe54939eb8072f0c599e9c55a1a9db509990c86466acbbd293235800751c17430593f2b82b1b4a3064e154821e18bd4928a14ae7c2470ceacbb79016d5589 WHIRLPOOL f1606fc37b112b2fda952dc1a48350fd863abd32cae7260c87940effb8333f55fa43b8d692393d358ff9ebec345a6efde41187a93ec30d9e0796cd5aaefad005
-EBUILD synergy-1.4.2.ebuild 1573 SHA256 a3b249de895ac714cd865195761b5d1c71451478eb3de2882da2f181859695ea SHA512 00680d4cbfac45abea43af2666e89b06b5669522886e1fb35e169ef30f7b078882682d29756e4ea7f5f5b7b9c09704792f6131d7ec3ca4708dfeb947eeefac6a WHIRLPOOL 8e0af7477f36d6469da119006ea34077c61a7bdc2cc76aa28fc4f08c8c382770a62d4f474ea5534d51592308b0503d017c09314cdde759eaa8079d7357d01e17
+EBUILD synergy-1.4.10.ebuild 1683 SHA256 c6136aa808b0221503ccac3a16d25769a79ebe80e7c2eda2092c7b4aadd58211 SHA512 444b4364d4cad7179e5a126c1cc55e41ed45d0cf2c253a90b1802e64e2e1124d4399bc183945868f46e36513f393feb53adc170749c11401c0d5d659aca6f15e WHIRLPOOL 0b06f83e1970b3f6216813e33fa8ad327d7dbe668aa2a0a2d480d723c2478b8178f0b534cc10fb7c4b6379604ee74621f63580ff2f7129435a065ff28333b44d
 EBUILD synergy-1.4.5-r2.ebuild 1783 SHA256 bd571a64036a50182535deb4d58df6bdbefdc94a21486e5e5827258aa291f0a7 SHA512 b8e2f7707a97cfced6e3fad9d35943af42fe8bfc19faa1a397f95f4bffc22a0458497faa3e0a2b22847b5698a91ebf6743d77a07e2d1fdd6d43645cee2c7f879 WHIRLPOOL 1cc09904bb697b35458b14daa9feab0e2c0518d7bc14e9a7863840366a173b39f14d1a09b0a31cd7120a34d5e2f4603e17b920610c1ec9c89988dc68cb01ec02
 EBUILD synergy-1.4.7.ebuild 1676 SHA256 0e937c5e0f4016a5d5e1aeea1ba8f6c3f2199ce67be9b2f8d948ddee6ec89901 SHA512 5e745594334110190c5c88fa1e8b526fb61f72a5dc13751792c42d4d1f30d44874e610ca63ff829010612883aef26b399c71c30e4cb6eeb3d3dc5b78d0350e05 WHIRLPOOL f628121c3ad56ec57547432be4351d052cd7847d275c9cac565322690c693e2e228a39b48adbbaf6556451fc1449ec337954b73d5d44d4317c4a3be83bf2805f
-MISC ChangeLog 11417 SHA256 3c8a976ef1d0ef3fdaab030fa47ad945ff54a2ed5e170970522d139b7e4af52c SHA512 e09409e33d9d4b8e72adbc220ebc6a0810c715177b926b069057e6d88ab21e567ebbb55d1fba0aa2ab28d53e7003cb8354238bc2a82054781a365c9cb6c5db5e WHIRLPOOL d44eed6a4a8f704d9d092732c2f2daa36e7272d5e37e5126fb91674eff6f56649d82276880dc375bfcfb8c3c15d0325af7cefe4228d50ef396e05bed77519cbb
+MISC ChangeLog 11680 SHA256 c4395ec175ba61a90f67ed84e086130759472e131ebd954c1d2647829991e31c SHA512 b060f2ede111d8c2363d27f2cf5a207f3d926be5e94d88b7cbf2d18ee925ef25ba6d9f735bcda5900d9fb28572c22b08c948fb985acb57da63588e0bc66511c2 WHIRLPOOL 66f65c21b84aeb21db5cd1e2ec5b0bbb2580046b558c78847badcd92bc007e6e0f62bbbee6ac35b0d575af020c7caa8fcf53566b0a5f8de3c180b56b9ab5fe06
 MISC metadata.xml 309 SHA256 dbe19c7fc9f67d80d5ead0d7bbff1bcd6403087c2b8b03052adebf24d80fb2c2 SHA512 4ed9bc97bfe2462d52bba63a760cf614cdab73e6a2e39d5439737f984adf72fb3c24699b60ef8d7eed5a8f7651fed1abf063f3c53dfb5fbf1bda8b9eae6270c8 WHIRLPOOL d1eff3eaa2556371beea7bc0b921235e7602f6d297dd2c8f80505545ea034ac57f210df85dc06398aa2f9f770b8e8c68e78e6a3821ea99a7c0325e1e90300167
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQCC7zAAoJEMbwO6tnXQ0sFkIIAJNNnC7TUXlDoZ2gKMwYS/uN
-syUd+tV2yQk1zdRW08jI4vsVUv8tRY5VdDbyVdiw//4PAIvqqXYVPJqoWUZwMMhh
-/YXDqv7u3+SjUpnxHEZU5tMuoTcRDPupouPwe1+xut8W9wiBmio9NpzTqx0sS9eO
-9S6oNnnjHl+0VnfAhB+PbYv4IxKd0GgN7gxRyJV4+spggBx0q/eTECq0IvSK+FQu
-HC07/dquFMMTapx+swqmpolcts5kHAZ/20BU0WYmqoeeFBRKXX83nNtGfEt07vhI
-PpIS5o50lFjShHZFk0aFozcOc2uL0AmTbBy/jfy345m9JY0XmhflhbsCQ9Y4cEM=
-=SAxV
------END PGP SIGNATURE-----
diff --git a/x11-misc/synergy/synergy-1.3.1.ebuild b/x11-misc/synergy/synergy-1.3.1.ebuild
deleted file mode 100644
index 6ce116cceca0..000000000000
--- a/x11-misc/synergy/synergy-1.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.3.1.ebuild,v 1.15 2012/03/07 16:06:41 darkside Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers."
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
-HOMEPAGE="http://synergy2.sourceforge.net/"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-libs/libXtst
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/kbproto
-	x11-proto/xineramaproto
-	x11-libs/libXt"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
-
-	# Remove -Werror usage.
-	sed -i -e '/ACX_CXX_WARNINGS_ARE_ERRORS/d' \
-		configure.in || die "unable to sed out -Werror usage."
-	eautoreconf
-}
-
-src_compile() {
-	# debug causes an assertion error in switchInDirection()
-	econf --sysconfdir=/etc \
-		--disable-dependency-tracking \
-		--disable-debug
-	emake || die
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-	insinto /etc
-	doins "${S}"/examples/synergy.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "${PN} can also be used to connect to computers running Windows."
-	elog "Visit ${HOMEPAGE} to find the Windows client."
-	elog
-}
diff --git a/x11-misc/synergy/synergy-1.3.6.ebuild b/x11-misc/synergy/synergy-1.3.6.ebuild
deleted file mode 100644
index b2afba1a3409..000000000000
--- a/x11-misc/synergy/synergy-1.3.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.3.6.ebuild,v 1.7 2012/02/19 13:24:19 klausman Exp $
-
-EAPI=3
-
-inherit cmake-utils
-
-DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers."
-HOMEPAGE="http://synergy-foss.org/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}-Source.tar.gz"
-
-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=""
-
-RDEPEND="x11-libs/libXtst
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/kbproto
-	x11-proto/xineramaproto
-	x11-libs/libXt"
-
-S=${WORKDIR}/${P}-Source
-
-src_install () {
-	dobin "${CMAKE_BUILD_DIR}"/${PN}{c,s} || die
-
-	insinto /etc
-	doins examples/synergy.conf || die
-
-	mv doc/${PN}c.man  doc/${PN}c.1 || die
-	mv doc/${PN}s.man  doc/${PN}s.1 || die
-	doman doc/${PN}{c,s}.1 || die
-
-	dodoc README || die
-}
diff --git a/x11-misc/synergy/synergy-1.4.2.ebuild b/x11-misc/synergy/synergy-1.4.10.ebuild
index 640aa5f87a24..5e17eb95c46a 100644
--- a/x11-misc/synergy/synergy-1.4.2.ebuild
+++ b/x11-misc/synergy/synergy-1.4.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.2.ebuild,v 1.4 2012/07/19 15:59:54 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.10.ebuild,v 1.1 2012/08/10 13:49:23 darkside Exp $
 
-EAPI=3
+EAPI=4
 
 inherit eutils cmake-utils qt4-r2
 
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libXtst
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXinerama
-	qt4? ( x11-libs/qt-gui:4 )
+	qt4? ( x11-libs/qt-gui )
 	qt4? ( !x11-misc/qsynergy )"
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
@@ -31,10 +31,13 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}-Source
 
 src_configure() {
+	# 1.4.4+ : http://synergy-foss.org/pm/issues/3016
+	append-ldflags $(no-as-needed)
+
 	cmake-utils_src_configure
 
 	if use qt4 ; then
-		cd gui
+		cd src/gui
 		qt4-r2_src_configure
 	fi
 }
@@ -43,27 +46,27 @@ src_compile() {
 	cmake-utils_src_compile
 
 	if use qt4 ; then
-		cd gui
+		cd src/gui
 		qt4-r2_src_compile
 	fi
 }
 
 src_install () {
-	dobin "${CMAKE_BUILD_DIR}"/${PN}{c,s} || die
+	dobin bin/${PN}{c,s}
 
 	if use qt4 ; then
-		dobin bin/q${PN} || die
-		insinto /usr/share/icons
-		newins gui/res/win/QSynergy.ico q${PN}.ico
+		newbin bin/${PN} qsynergy
+		# FIXME: convert the .ico file to a real png instead
+		newicon src/gui/res/win/QSynergy.ico q${PN}.png
 		make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
 	fi
 
 	insinto /etc
-	doins conf/synergy.conf || die
+	newins doc/synergy.conf.example synergy.conf
 
 	mv doc/${PN}c.man  doc/${PN}c.1 || die
 	mv doc/${PN}s.man  doc/${PN}s.1 || die
-	doman doc/${PN}{c,s}.1 || die
+	doman doc/${PN}{c,s}.1
 
-	dodoc README doc/synergy.conf.example* || die
+	dodoc README doc/synergy.conf.example* ChangeLog
 }