Fix DESCRIPTION.

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

6 files changed, 16 insertions, 131 deletions

diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog
index 338d7f199b00..b7b172856bbe 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.116 2014/08/03 18:34:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.117 2014/08/09 09:23:42 jer Exp $
+
+  09 Aug 2014; Jeroen Roovers <jer@gentoo.org> -synergy-1.4.15.ebuild,
+  synergy-1.4.16_p1969.ebuild, synergy-1.5.0_p2278.ebuild,
+  -files/synergy-1.4.12-pthread.patch:
+  Fix DESCRIPTION.
 
   03 Aug 2014; Agostino Sarubbo <ago@gentoo.org> synergy-1.4.16_p1969.ebuild:
   Stable for ppc, wrt bug #509656
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index c2b5e77e0d7d..48aa761d10f4 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,36 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX synergy-1.4.12-pthread.patch 405 SHA256 25c884bd6deea8c885bf69e01127d2deb10d73e371c151966885a5157ecfbd44 SHA512 fad9b04a46ee6a1f693051da9067ad25f33379929f0b6419c4501d5a773d25234af08c0785756575c22024aa47634b153c90313e04dee5edfe3da36b9390bb2d WHIRLPOOL 55805a25eceb0c1a660fbaa3a4a2f96a6caaf434f42a883c1ebcaca654cf012e5b377ca02c01aeaf87b37a4d9e06a1e9f84cb2baa41369ed22cad089b7922dc4
 AUX synergy-1.4.15-cryptopp.patch 2593 SHA256 dd73963efe5d95a39c3230d7abd26bc66187fc1f1691cb4cc4e6c7896ca528d5 SHA512 0996784c11d4eb80efbf620af2365bc68fe4be0d2c00ccc25b323fd1260f6f6a3586b5a008311c50daf66448b7b22defab516d65dcd3f321685cdb8346f00562 WHIRLPOOL aa9260385e056e8ed5fc6fb079166ec84324f58f7e4d46d5512bd0d8d94d9b77168aad34b9368061757efc3100a3b147d517b18538ca12aac2ef68c8446f8e68
 AUX synergy-1.4.16_p1969-pthread.patch 350 SHA256 b25728a13742beffb5b1526740eb2f41ecfe6605d972c20fe22209b061a5819e SHA512 c0ab4dca5cb0ae1963c20fd72b10dc958142ca7881ec48caffd4172cb89f47bb69bde1a1e61566abb61f8b953b7fd77930c4fd3092b65c13d3d04ce8be9fd91a WHIRLPOOL a2ef3514c3f58d65af0f5be1431cf4c19e478e801b3a2da8d2f67c741ce14997103734ac24af6235f1b3746bfd7a54524a0f2d3d2ec07769b28bd18ed8a01bda
 AUX synergy-1.4.17_p2055-CSocketMultiplexer.patch 427 SHA256 1fa78e418e8c16a3fee03351cfaddc00417cfbfb69d517664c5c99551c9ac9a5 SHA512 10917823af9113def5967721aedd637326f7e432231c1bc68a4c1795916fadf8daf2e06b436e0073da6c461d38fa00e444332462e7c95f84a97f1ea7d54bac31 WHIRLPOOL a310af036438365ef01ff404b41496fc881e70bf2ff019d8e5608a87d5f0fc516a07f08950d560a6d954b2d12db8ddc0d3c4ed67421472fac527cbfd3899e8c4
 AUX synergy-1.4.17_p2055-cryptopp.patch 2662 SHA256 d980faeec96cf1cd7f684d6f2bd4bfe461307c5a5c5e1ea4b9cf20d38a5a120d SHA512 eb502e57a0f6c80b8f0e8d64490d277d4b9659a2306e7ebd5a557ed0d386ba7dc870056e916fe04d653b6860ea78299b00895910372f9e5609f2480be54d3127 WHIRLPOOL 4b8122befcf03981a0ad4877de4ca4455bb4dee9167a9bdf3fd73f181c3168170fcf975a516eaef8043b6ee6e14c0f55e46de44ef2af972d8032647b3cb32116
 AUX synergy-1.4.17_p2055-gentoo.patch 344 SHA256 924b3ad8f7c4840b900a6d4f532742121f065141b801554b612adecf6aef611c SHA512 de9e59f4f7704a3a5baf0ea895ac88c4c076145c3bc6ce5edad410a044ce782226ace71984e78c897261fb92f7c97deaf886769f7bd336a85d23af5f501b1d7b WHIRLPOOL 0cc03877f9b4df0e10179d2ecead957d6bd8aa7dddf700e8d595033ea3bd2eabe947a263c5a94592f4c046a8625bd9a33138c4b93c71cd82f4b2ac373f73d3a0
 AUX synergy-1.4.17_p2055-test.patch 977 SHA256 2373895ff2a67a44b37d634c16b474865ce992d497c4a1b05def510776870006 SHA512 92746308f3f6fe22b337d383e268328c37695e8f51ac20759557021d1149b4e4cc676846cc33d3728453284b9ae15373995d347719c1ba8af9b9d3b31d8e463f WHIRLPOOL 9b637b57668b1c8df064f69584192d29ce11f940b4f67d78a8e10f6610846e37ac3460326949efc6df78289dffd80a916c40527879cf2391a1845281b93af844
-DIST synergy-1.4.15-Source.tar.gz 4122349 SHA256 643745888ec6150e74cb6da9813f8c7572f2f87cf35f0bd4f64cc1e467ef3550 SHA512 857e8cbfb0b32c7dc325de5765f182f4e4fb198443b4a3e26d38c2d3dec3819e57057b91a202b53c86d4fad18154d1d58b401812dd8fabc384255e44d4b4b01a WHIRLPOOL 598256b9eb65a5df1f240309ddccd5f75ed4504124c76ac0a7430e62e89ee9113c5a4ce4e92aaa6edcfdb2c892597f67099e720261994e6124780a21f9e3f916
 DIST synergy-1.4.16-r1969-Source.tar.gz 4130057 SHA256 dd95dae13ef284b5554a48f0693b36519b956891a2b5bbfe4f5d07ea1e9aa552 SHA512 4411fc1ac1841c5805b7ff90f266e5dd6f4a0ca6b4576b5ac41695e3f5ffdff05fec6223930a2edfeccd17f0b806346af3f5d37cbce69b00e533164cd6146c1e WHIRLPOOL 7f6b04d39f7a2bb9b6496a4298f5eaec961909a3de864b75f26431ddf496e09d62f4a954fe0de9949cdaf6697ecf62eace572ce31fed268a2380ce13c6fdcef7
 DIST synergy-1.5.0-r2278-Source.tar.gz 4350894 SHA256 66bf6016a2e71b2b2b26fc445d28324d1d286b6fca7ae3e9d19fd300769af024 SHA512 8429304666fdb21e1becb3960c1c9ecba2a154170681b79ee444ea818291f1d378c73c82674351cb097cb08857b7f9c61908e5ab46152363e4ff22c2c50dc8fd WHIRLPOOL 74488dda0d0aa70b070b3a841311e1c8305e87365e526c54702d727ae35429b8dc5e7f5aab5028dab1a26d724e5e3f57bca3646a6d0f064af8259ec47f406e7c
 DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
-EBUILD synergy-1.4.15.ebuild 2007 SHA256 421ef73284746fa9ac93e70905f64ea817a1a1f257d44a3b2f496b4feb7ff6df SHA512 725dc966d7702b6016c7564cf4edd2bf13948f62c7be4b902134212ece9cab5b2aefc8754b1181ae1c89c67b1666cb4f905ebfe9fb2cf2ff99dbe0e00be120ea WHIRLPOOL d96cb0e6006a2d4a1398a6fcf41cdcc622dc7434b2ed5565514ff5395eeae7e5db667148814a06bbce3bdd6f58ee4ad5e1bb5de01c529d0f5347725b739fa416
-EBUILD synergy-1.4.16_p1969.ebuild 2033 SHA256 173236fab3710b908bca41fa28893ed48ad070c1d29760631672fd0058de9b87 SHA512 43f7c2a51085f291c7f163a1491f61b3515d0a1999232d96b3d2809d1577396f50a6b2a86904e4e5ddb0642bc1689965c83a9ae768aba95f8eaa39c27f12168d WHIRLPOOL 61da3ec0dfd042ccbe7b2397f43c2ca98b9462ed58990fe74ea1b80bcfc0b7713678a01a9b9104079f7102e70a68a01a0208448b1d125d32e28fd469769045d4
-EBUILD synergy-1.5.0_p2278.ebuild 2490 SHA256 0bc3694a6a23b4957bb4c71e6b00bcca4ea59977348b83ed72424cf48e3cbab0 SHA512 a90869e8264b144d6c909adbc8df5cfe3c3c78ec55b58c2deca3aeaf5e7d4be8746a7cd6ceb0258f6d1e55a2d617d625ecca6f2cc0b39fa1e29f4709c540cb78 WHIRLPOOL 55cf5c4e2ad41f0c02ba59421d40e012424873a7ab271a45f7ab350b954897a772a562b7d1e1606866475f31a810515714d2d738e5e85df5a89aa04d0b21e253
-MISC ChangeLog 16511 SHA256 e2056b7437b87a65132c5607b82760ea90dec456caea3c8dc0ae73308574e7bd SHA512 b4d3882d44e3199736e9a40a5d45106dbcecac4ae32d6c94293f3e0cf69af5ab26ead9f5fa04dbd2a9cd30b4b951d80a937b3489b6150e47cabac14332ac53eb WHIRLPOOL 529e5a3bf098d930f565e9a3c0eb29c9e75aed054491e21288b485395a5de4dde2ea33c353040ff33302c70f7a93cdd9f5c35f58ee88d6678e96f7199a1b98db
+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
+MISC ChangeLog 16700 SHA256 47d02b4817f464da3f291006cd72c1279a526de33e2127e3f9325b1201c10ed4 SHA512 30ccc9f54653f2a8974ba6766a07541a7f245550dbc083bddc62b6e85946a6c924db46282aa98f7e00ec50895658465a8a840acf13890225e50754afe0499e12 WHIRLPOOL c4a10af8a2416a7dc5f2ea2705d897c1f9ceda42ff25fbe6e06e262953c1acaf9384a322df9149699d059cd99bb0c43e93b1e7d4c290179ec3fe2c0b108ae7c8
 MISC metadata.xml 243 SHA256 16d6a09278140777930f22eeaf42238d2a5168e539c14f8fd7b1b2be1132539c SHA512 86dc9a5aecb9dfdabe223750574bb8469e4dd4fb89e3ea5b2a683de1f68c5829460c60d16d8a748c17f2b6daf3561d054aa5283f6a37c52a8a60fba6ebbfce14 WHIRLPOOL 9e7beb2b0a4715dcd6a1d9d22c0ce9f82b9871dabdb2693dc4f11589bb0a1aa807855fdfda2d415b0807f5e31c3e4ced43e97e2c761c967452e5bc1e52e81df5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT3oCxAAoJELp701BxlEWf9ioP/RSBBh7GYcWBeUArohLSAh6w
-A/y809ND89bgJWaBGlip5C45NQPBOPtuBGUfpQqg1tD+MxMFMbMxm0psI3i0wruE
-yWyAVHzyCK6luvepFMX7COsVbQvfGldrH2eRDqjv71C7gQNslBNWnB+7D1oAkD1/
-XZbqZEhZTQcgKyhJIA9Vk5gtlupxYlF5936zR/BqUunDeJFK/FZEjdXokYDfn0r8
-0kAxjlbEBQ3hhQosglVOpTyHsMc3TZofSYyxvTOl2qYIj+iD7VUGlMlAt36otbIi
-mpC+nyhQzyAiPuOx2leGKWpqu0rhRVDFAU8rssVQj4fnboBtJ6fWoDJ7ExWlx2pn
-xblraVzAddgtKFE+IFPQZdQyCRJyMYQ1WWECce8EEFjlk5Z/L6+TZRpuRD2cbWQz
-Fp+BCEeo7uTcCJqYQNjXD+pcdlUIrdHA25vsnpAsI5ROPSFZkEptCXEIiVeU/u3K
-ITt7GEtfd2vPPgNV1Ak02SFpQiXiVNGVacvIVtMmgUd4+p1lhJ4cBAw/9c2H0rde
-HbsHVNEJWSP4N3VJBFpUxhRTmiHSwR/n9AZcxOodKtzAUdX7AwajpgVgQHpWOCor
-csRA9jVpgWzQYAfJuzjFdebRRyxyMr3S6KrW+VUh4vN+saOLowDVA8+FQL1dkznz
-BkuMmTZufMFeS4k/I/VU
-=2XHq
+iEYEAREIAAYFAlPl6KAACgkQVWmRsqeSphPx5QCcD0nnfKCMgDqm0zec8q18Lw4G
+IYkAniPNFFL9wBy/3f1BKmuXzjlReX0X
+=HZKL
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/synergy/files/synergy-1.4.12-pthread.patch b/x11-misc/synergy/files/synergy-1.4.12-pthread.patch
deleted file mode 100644
index bb1a23a6cccc..000000000000
--- a/x11-misc/synergy/files/synergy-1.4.12-pthread.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -136,7 +140,8 @@
- 	# pthread is used on both Linux and Mac
- 	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
- 	if (HAVE_PTHREAD)
--		list(APPEND libs pthread)
-+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
-+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
- 	else (HAVE_PTHREAD)
- 		message(FATAL_ERROR "Missing library: pthread")
- 	endif()
diff --git a/x11-misc/synergy/synergy-1.4.15.ebuild b/x11-misc/synergy/synergy-1.4.15.ebuild
deleted file mode 100644
index 8bb2822a5283..000000000000
--- a/x11-misc/synergy/synergy-1.4.15.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.15.ebuild,v 1.8 2014/05/08 18:24:23 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/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}-Source.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"
-
-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 )
-"
-DEPEND="${COMMON_DEPEND}
-	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.12-pthread.patch"
-	"${FILESDIR}/${P}-cryptopp.patch"
-)
-
-S=${WORKDIR}/${P}-Source
-
-src_configure() {
-	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_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
-}
diff --git a/x11-misc/synergy/synergy-1.4.16_p1969.ebuild b/x11-misc/synergy/synergy-1.4.16_p1969.ebuild
index ee333b4b1169..7a12315ab808 100644
--- a/x11-misc/synergy/synergy-1.4.16_p1969.ebuild
+++ b/x11-misc/synergy/synergy-1.4.16_p1969.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.16_p1969.ebuild,v 1.8 2014/08/03 18:34:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.16_p1969.ebuild,v 1.9 2014/08/09 09:23:42 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."
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
 HOMEPAGE="http://synergy-project.org/"
 SRC_URI="
 	http://fossfiles.com/${PN}/${P/_p/-r}-Source.tar.gz
diff --git a/x11-misc/synergy/synergy-1.5.0_p2278.ebuild b/x11-misc/synergy/synergy-1.5.0_p2278.ebuild
index 8200b7c082fd..06a956ef93e7 100644
--- a/x11-misc/synergy/synergy-1.5.0_p2278.ebuild
+++ b/x11-misc/synergy/synergy-1.5.0_p2278.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.5.0_p2278.ebuild,v 1.1 2014/07/16 22:03:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.5.0_p2278.ebuild,v 1.2 2014/08/09 09:23:42 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."
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
 HOMEPAGE="http://synergy-project.org/"
 SRC_URI="
 	${HOMEPAGE}files/packages/${P/_p/-r}-Source.tar.gz