gentoo resync : 13.05.2018

17 files changed, 188 insertions, 517 deletions

diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 3bfa9a57108b..ac03b4d8b8ee 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,18 +1,11 @@
-AUX synergy-1.4.16_p1969-pthread.patch 350 BLAKE2B 3f77706a1b3d165bb648649758f25526f861809a1022d2404e2763762e2f47bdd912757e06c891c734717b82ef85a6111980e3b6ecd2188ebf35b60295205d66 SHA512 c0ab4dca5cb0ae1963c20fd72b10dc958142ca7881ec48caffd4172cb89f47bb69bde1a1e61566abb61f8b953b7fd77930c4fd3092b65c13d3d04ce8be9fd91a
-AUX synergy-1.4.17_p2055-CSocketMultiplexer.patch 427 BLAKE2B 06452ffb16c812fe75066544b68798deb1fdacf34f14e18b19c85a112cf5e94da85789516b79c5777ec94b181555f557308a8e6489284a9380071e43bef6817a SHA512 10917823af9113def5967721aedd637326f7e432231c1bc68a4c1795916fadf8daf2e06b436e0073da6c461d38fa00e444332462e7c95f84a97f1ea7d54bac31
-AUX synergy-1.4.17_p2055-cryptopp.patch 2662 BLAKE2B 4b0dbe1eaf89f8ae1154d79f070d7a251a2017ebf4ebd83866468ee0d585d752c247d2ebddce62a03318f003817ec556e08022088350fa0da11e3d123f453060 SHA512 eb502e57a0f6c80b8f0e8d64490d277d4b9659a2306e7ebd5a557ed0d386ba7dc870056e916fe04d653b6860ea78299b00895910372f9e5609f2480be54d3127
-AUX synergy-1.4.17_p2055-gentoo.patch 344 BLAKE2B 348be10a5f712aec22e1bddd7740a95416d0aba5efa6ce40cc15d8135d73b3abb3bb462dcd5a6ec2dc044e5c809f9be3011c31b46b1edaa2afaecf9cb1972f23 SHA512 de9e59f4f7704a3a5baf0ea895ac88c4c076145c3bc6ce5edad410a044ce782226ace71984e78c897261fb92f7c97deaf886769f7bd336a85d23af5f501b1d7b
-AUX synergy-1.4.17_p2055-test.patch 977 BLAKE2B 699925ef12703c8bfccc90fa89a53ab69518ef3ab18c770279824ad87f64650d4218dd7c4c2531eb5ac729b49ee418ccc878999489c397d0d003c4ed7218c368 SHA512 92746308f3f6fe22b337d383e268328c37695e8f51ac20759557021d1149b4e4cc676846cc33d3728453284b9ae15373995d347719c1ba8af9b9d3b31d8e463f
-AUX synergy-1.7.5-gentoo.patch 396 BLAKE2B 5002e7393232888289504a7412521478dd16e3d62bb875977c746f3b91e0f03c4a67c1ecf0a54eec87d5cadbb2c3403dd9f366d74bab90a1d7e9d46351e5e7e1 SHA512 2ca7a5f36f7fc0949c6832506efb8d8516390ff5f238c14dc600ec03f28f5691e3102753db8c4986a5445950b3154e1410d40e3cc1974a2b9b84476ad77f0e83
-AUX synergy-1.8.1-internal-gmock-gtest.patch 737 BLAKE2B 0e1131d666442f9197b0e1534947fd5da01438ee7e15461050fa4d910c9355f7366025d602e7c664c45255744bab1ca103bddf058294cd807fa8c35f77607382 SHA512 cec725312fea90d3df62957e16fef25c7988f50569a99e80b9d6724fb0f100211820256143f87b02099aa5fffa1d434ce71638f88e225cb6f0fa9a597d2074cc
-AUX synergy-1.8.5-gtest.patch 826 BLAKE2B 664d765908f2bf688712106c2d8961cdfe5518521158489a23851b33d69186b72755abfe33af2d3bb58830c02188dcdd27eeee962f49578462256b6ebcfa7c20 SHA512 6e19bcf424405c2dfcdd65177053946868d019e5042404f7d1ab79a68a4453e906da84b8c714770d0157df482dfd3fdbb793e567d9657804679b548761d1b716
-DIST synergy-1.6.3.tar.gz 4405517 BLAKE2B 46a56a9833ac0132d0fefcbeefccbc440d3d4e123eceb4ccb04eedadd6fa9dec9abb6f7770d6739b576006783a8890788d53027d9d5a5b245ef6b14dc704e72b SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165
-DIST synergy-1.8.6.tar.gz 13497043 BLAKE2B f74f6d48203bc49d7a74cf2f951ea506a1887b659e34954651d2a8333e604e3e41e04b5e6b6115b8b8ded6e94fbad004b0673465cb0734a57d137992f432a3c4 SHA512 e0816c280c77d4a865f4b7d4a9081963032a156bfb6da51e6b67a6fc41f8f18b097d3fc7c96218db268c36d0148021f9ddba95fe56daff8bfc54219dbdfe14a5
-DIST synergy-1.8.8.tar.gz 13498599 BLAKE2B 40c52ed036ef21594d330f1b4e32b647bdb3076147d40f2437f649a54700cb4a7822137587c129f9bede26a93e872961135ee27dfb3b8f4256153a5e982737a1 SHA512 b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6
+AUX synergy-1.9.1-cmake-version.patch 2136 BLAKE2B e96bdfdc278e818be0f46eb2bef7dedb24f70d6fbab3b0ec36716811590f55a742f2d61b6976f6b3eb16490a2deedf6664ee556244065a97afbf2b603d151ec3 SHA512 80dd8adcfe58eff2d6ee74b5e2e408ded1b9b112e72d8bb1d86d33a12c778c5b8bb359501490dff0a896e21f23dc321bcf670fcb2d5cdf66a0ba5a8904f206cd
+AUX synergy-1.9.1-gtest.patch 641 BLAKE2B 30103de347404858f35eba8600a961b7f01fa0f4469f293cdf13fb3956d02467924a17e0870fa690e715c5a02bf42d67cc4a103d70af8d006ed381d4fbefcac3 SHA512 c81471a2bded4aeafafb8c0369e6296dc32cf39371795082663d408fd6308d6b520f90bb7e7b57c5156d8e4e3cdb261eead4ac9668a4e0e18649a9ae0d256f64
+AUX synergy-1.9.1-internal-gmock-gtest.patch 725 BLAKE2B 2c7d6a2a2086283e761f3322959d3721a0e1b687683a0420eb282bf841ad5597925bdadd6098615a54e2fe6230e9efd8e0be1063fde8a881deafc149a52329a2 SHA512 1a644f8cb7422cbc36d0ce37648038ae464f7a1c26efb89ff07477447ee69ff2ea10d71765536e19269d63249db6391d997680ad06df1a5c24e1fcc708f2ba3c
+AUX synergy-1.9.1-pthread.patch 391 BLAKE2B 8d1aabe8a8ddcd1494de5aa5d19428e4e2d248fbef5a372fa1102f36d2e8e7868afdafce0109293b517b81ba3104f7555a9d3e808f5f3752434068ef527626b2 SHA512 8ab56a98baa7f97034bfd2e9577d84edbf7fbd954bce76b2674fe90f0baf9d91bc5f2d5550f7c57cc214316a34fb2769b1c91c4bcfbe967f13fb64863941cb24
+AUX synergy-1.9.1-qt-5.11.patch 1211 BLAKE2B f457b5d8afa5c9fe0d750a5d80a6baa44edecb88bb907e5e260f10aedd1978a9c7b56a90cf83a6d4df227ccb548c416196a9ad7c30053aa6b14bedf2a1862042 SHA512 7931de105c6dd7a0d673dacb4ed26ceea6e5ed78460a8c8c8e7104c662d884de37fbe2a8d497c1a3689fcd6316063e3cd3bdd1d7e1650add52153deee0669fc2
+DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7e4895ff65ddfae18b06892959e8c7e56092b3d49f123768b3ce92d59fc890afe756192b3625db664b5fa19331e SHA512 83301f2d035bd91578cf83e335d721748791f62c85252156fd27d09db7b5216a745cfa81c06b27995d1785e676ee4c75f795b5fad2b9a700a981d27d05e5a8fe
 DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
-EBUILD synergy-1.6.3.ebuild 2412 BLAKE2B 4ca64747eca5280decc5e74d153f8ebfc3048e8c2ac2ba2f01d916a71905003b0a96d031aa557af22af3ae7fb036a87e889f1eaad6cd6ec309e0bf41841cbe12 SHA512 9aefd0f61ad9a40b11c97d0821dc7b1640d48ef8028ca18bd69ddbe655ad9c1e3f9da1608b22525d7c6dc2d3803d23b0ab687ad702d8829c4427e3e56513fc91
-EBUILD synergy-1.8.6.ebuild 2260 BLAKE2B bf5c5e1b68f5b2c352b7e9321859f718475c0af20a1172f5e7a2f47029831c2459e3800cb1b9fca7b4503734c8a387f133f873eb2af48ca674ae9093a12ce7f6 SHA512 9df3c38dbfd69f202e7807a45ddb27d370fb98bee63569101c6e784aecfe7d0a891f3b20e2ac877c677a2a4f9902bef38fdec01636ad9aec96ec0e47d9e7af10
-EBUILD synergy-1.8.8.ebuild 2220 BLAKE2B 08ae66225fefd47b405db383241937cd138ba8edb3842385237f1581b3ee9ea3c86b2620b2c77f99e3e58b45bc1fcdbfe7177adb787f5b86c0fece5d7d4f377b SHA512 3e60699cec7c71626ecbaae3c7d3fab34918a1340fb0f63c25d731398919339597990c25431b1b28efa746313c27fa8bf0a6822f1fd87a8c4a30f94034cf025f
+EBUILD synergy-1.9.1.ebuild 2217 BLAKE2B efbfc6e59d47df62028babcf15b94b32a3e6f84df361cea69896e865f0789adbe6915ed5e40586aba7946b980229f457ee3d1dc87f2a66db11722d1c3d03a8de SHA512 18d0f1cbbcb443a61cdb2da3c1285f7e714cd3bb9039e0d197bf8ac37f3d63d18a11dbedf6a3d3edf8a4768e430716e1d5f5e06061ac54d63f040dc3d3c2fb75
 EBUILD synergy-2.0.0.ebuild 1525 BLAKE2B 350eab710ba71bf5ae7f1c25d4a9830c6eeb5500ef306fae6628c9fefb02e441b3f54ae0afc815025c8ac4b5389aca56db55309d5409a2ca4fd001c1bd7c021d SHA512 312e7107eccf03ad4022c9e6d28bb2b6c75ec4594e8585cf1bd27badf52d496fd9096a97fde4f5104486f5abe7aeed7c2bd3eaa1b4c52294a7f4510de3115038
 MISC metadata.xml 408 BLAKE2B 2572799c57cee21427948e30551975170b9f655fb2fd0fe307eb7e01eba868a1355fd69df540be767ced000847547d107ad36ae4b8658f0b8628f5960dd4a983 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7
diff --git a/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch b/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch
deleted file mode 100644
index adddf2f73b67..000000000000
--- a/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,6 +141,8 @@
- 	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()
- 		message(FATAL_ERROR "Missing library: pthread")
- 	endif()
diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch
deleted file mode 100644
index 0e99fd3bce5d..000000000000
--- a/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://synergy-project.org/spit/issues/details/2935/
-https://bugs.gentoo.org/show_bug.cgi?id=505978
-
---- a/src/lib/net/SocketMultiplexer.cpp
-+++ b/src/lib/net/SocketMultiplexer.cpp
-@@ -243,6 +243,7 @@
- 		for (CSocketJobMap::iterator i = m_socketJobMap.begin();
- 							i != m_socketJobMap.end();) {
- 			if (*(i->second) == NULL) {
-+				m_socketJobs.erase(i->second);
- 				m_socketJobMap.erase(i++);
- 				m_update = true;
- 			}
diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch
deleted file mode 100644
index 59f85a9c29a0..000000000000
--- a/x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,6 +145,10 @@
- 	check_type_size(long SIZEOF_LONG)
- 	check_type_size(short SIZEOF_SHORT)
- 
-+	set(CMAKE_REQUIRED_LIBRARIES crypto++)
-+	set(CMAKE_REQUIRED_LIBRARIES)
-+	set(CMAKE_INCLUDE_DIRECTORIES)
-+
- 	# pthread is used on both Linux and Mac
- 	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
- 	if (HAVE_PTHREAD)
---- a/ext/CMakeLists.txt
-+++ b/ext/CMakeLists.txt
-@@ -13,47 +13,6 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
--set(cryptopp_dir cryptopp562)
--
--# only compile the crypto++ files we need.
--set(cryptopp_src
--	${cryptopp_dir}/3way.cpp
--	${cryptopp_dir}/algparam.cpp
--	${cryptopp_dir}/asn.cpp
--	${cryptopp_dir}/authenc.cpp
--	${cryptopp_dir}/basecode.cpp
--	${cryptopp_dir}/cpu.cpp
--	${cryptopp_dir}/cryptlib.cpp
--	${cryptopp_dir}/des.cpp
--	${cryptopp_dir}/dessp.cpp
--	${cryptopp_dir}/dll.cpp
--	${cryptopp_dir}/ec2n.cpp
--	${cryptopp_dir}/ecp.cpp
--	${cryptopp_dir}/filters.cpp
--	${cryptopp_dir}/fips140.cpp
--	${cryptopp_dir}/gcm.cpp
--	${cryptopp_dir}/gf2n.cpp
--	${cryptopp_dir}/gfpcrypt.cpp
--	${cryptopp_dir}/hex.cpp
--	${cryptopp_dir}/hmac.cpp
--	${cryptopp_dir}/hrtimer.cpp
--	${cryptopp_dir}/integer.cpp
--	${cryptopp_dir}/iterhash.cpp
--	${cryptopp_dir}/misc.cpp
--	${cryptopp_dir}/modes.cpp
--	${cryptopp_dir}/mqueue.cpp
--	${cryptopp_dir}/nbtheory.cpp
--	${cryptopp_dir}/oaep.cpp
--	${cryptopp_dir}/osrng.cpp
--	${cryptopp_dir}/pubkey.cpp
--	${cryptopp_dir}/queue.cpp
--	${cryptopp_dir}/randpool.cpp
--	${cryptopp_dir}/rdtables.cpp
--	${cryptopp_dir}/rijndael.cpp
--	${cryptopp_dir}/rng.cpp
--	${cryptopp_dir}/sha.cpp
--)
--
- # if 64-bit windows, compile asm file.
- if (CMAKE_CL_64)
- 	list(APPEND cryptopp_src ${cryptopp_dir}/x64dll.asm ${cryptopp_dir}/x64masm.asm)
-@@ -87,10 +46,3 @@
- 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CRYPTOPP_ARCH}")
- 	endif()
- endif()
--
--add_library(cryptopp STATIC ${cryptopp_src})
--
--if (UNIX)
--	# ignore warnings in crypto++
--	set_target_properties(cryptopp PROPERTIES COMPILE_FLAGS "-w")
--endif()
---- a/src/lib/io/CryptoMode_cryptopp.h
-+++ b/src/lib/io/CryptoMode_cryptopp.h
-@@ -25,6 +25,6 @@
- #	pragma GCC system_header
- #endif 
- 
--#include <cryptopp562/gcm.h>
--#include <cryptopp562/modes.h>
--#include <cryptopp562/aes.h>
-+#include <crypto++/gcm.h>
-+#include <crypto++/modes.h>
-+#include <crypto++/aes.h>
---- a/src/lib/io/CryptoStream_cryptopp.h
-+++ b/src/lib/io/CryptoStream_cryptopp.h
-@@ -25,5 +25,5 @@
- #	pragma GCC system_header
- #endif
- 
--#include <cryptopp562/osrng.h>
--#include <cryptopp562/sha.h>
-+#include <crypto++/osrng.h>
-+#include <crypto++/sha.h>
diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch
deleted file mode 100644
index 89f46f3c9af0..000000000000
--- a/x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -77,7 +77,7 @@
- 
- 	# warnings as errors:
- 	# we have a problem with people checking in code with warnings.
--	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-+	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
- 
- 	# For config.h, detect the libraries, functions, etc.
- 	include(CheckIncludeFiles)
diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch
deleted file mode 100644
index e0e25c2e128b..000000000000
--- a/x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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} MATCHES "ON")
- 	add_subdirectory(test)
- endif()
---- 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/files/synergy-1.7.5-gentoo.patch b/x11-misc/synergy/files/synergy-1.7.5-gentoo.patch
deleted file mode 100644
index 9c508f68eeef..000000000000
--- a/x11-misc/synergy/files/synergy-1.7.5-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,7 +80,7 @@
- 
- 	# warnings as errors:
- 	# we have a problem with people checking in code with warnings.
--	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-unused-local-typedef")
-+	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-unused-local-typedef")
- 
- 	# For config.h, detect the libraries, functions, etc.
- 	include(CheckIncludeFiles)
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
deleted file mode 100644
index 7814c7418cd3..000000000000
--- a/x11-misc/synergy/files/synergy-1.8.1-internal-gmock-gtest.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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/files/synergy-1.8.5-gtest.patch b/x11-misc/synergy/files/synergy-1.8.5-gtest.patch
deleted file mode 100644
index 69391b217db2..000000000000
--- a/x11-misc/synergy/files/synergy-1.8.5-gtest.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/lib/synergy/KeyMap.h
-+++ b/src/lib/synergy/KeyMap.h
-@@ -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
-+++ b/src/CMakeLists.txt
-@@ -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/files/synergy-1.9.1-cmake-version.patch b/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch
new file mode 100644
index 000000000000..da7a603119d3
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch
@@ -0,0 +1,57 @@
+--- a/cmake/Version.cmake	2018-04-10 12:18:42.000000000 +0200
++++ b/cmake/Version.cmake	2018-05-11 23:29:24.499906356 +0200
+@@ -23,7 +23,7 @@
+     if (DEFINED ENV{SYNERGY_VERSION_PATCH})
+         set (SYNERGY_VERSION_PATCH $ENV{SYNERGY_VERSION_PATCH})
+     else()
+-        set (SYNERGY_VERSION_PATCH 0)
++        set (SYNERGY_VERSION_PATCH 1)
+         message (WARNING "Synergy version wasn't set. Set to ${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}")
+     endif()
+ endif()
+@@ -36,29 +36,6 @@
+     endif()
+ endif()
+ 
+-if (NOT DEFINED SYNERGY_REVISION)
+-    if (DEFINED ENV{GIT_COMMIT})
+-        string (SUBSTRING $ENV{GIT_COMMIT} 0 8 SYNERGY_REVISION)
+-    elseif (SYNERGY_VERSION_STAGE STREQUAL "snapshot")
+-        execute_process (
+-            COMMAND git rev-parse --short=8 HEAD
+-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-            OUTPUT_VARIABLE SYNERGY_REVISION
+-            OUTPUT_STRIP_TRAILING_WHITESPACE
+-        )
+-    endif()
+-endif()
+-
+-if (DEFINED SYNERGY_REVISION)
+-    string(LENGTH ${SYNERGY_REVISION} SYNERGY_REVISION_LENGTH)
+-    if (NOT ((SYNERGY_REVISION MATCHES "^[a-f0-9]+") AND (SYNERGY_REVISION_LENGTH EQUAL "8")))
+-        message (FATAL_ERROR "SYNERGY_REVISION ('${SYNERGY_REVISION}') should be a short commit hash")
+-    endif()
+-    unset (SYNERGY_REVISION_LENGTH)
+-else()
+-	set (SYNERGY_REVISION "0badc0de")
+-endif()
+-
+ if (DEFINED ENV{BUILD_NUMBER})
+     set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER})
+ else()
+@@ -66,7 +43,6 @@
+ endif()
+ 
+ string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC)
+-set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}")
+ 
+ if (SYNERGY_VERSION_STAGE STREQUAL "snapshot")
+     set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}")
+@@ -80,7 +56,6 @@
+ 
+ add_definitions (-DSYNERGY_VERSION="${SYNERGY_VERSION}")
+ add_definitions (-DSYNERGY_VERSION_STRING="${SYNERGY_VERSION_STRING}")
+-add_definitions (-DSYNERGY_REVISION="${SYNERGY_REVISION}")
+ add_definitions (-DSYNERGY_BUILD_DATE="${SYNERGY_BUILD_DATE}")
+ add_definitions (-DSYNERGY_BUILD_NUMBER=${SYNERGY_BUILD_NUMBER})
+ 
diff --git a/x11-misc/synergy/files/synergy-1.9.1-gtest.patch b/x11-misc/synergy/files/synergy-1.9.1-gtest.patch
new file mode 100644
index 000000000000..f7a5e614e810
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.9.1-gtest.patch
@@ -0,0 +1,28 @@
+--- a/src/lib/synergy/KeyMap.h
++++ b/src/lib/synergy/KeyMap.h
+@@ -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
diff --git a/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch b/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch
new file mode 100644
index 000000000000..bc8a96130575
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.9.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
+-    ../../ext/gtest/include
+-    ../../ext/gmock
+-    ../../ext/gmock/include)
+-    
+-add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/gmock/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/files/synergy-1.9.1-pthread.patch b/x11-misc/synergy/files/synergy-1.9.1-pthread.patch
new file mode 100644
index 000000000000..46ae6e1588b8
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.9.1-pthread.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,6 +141,8 @@
+     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()
+         message (FATAL_ERROR "Missing library: pthread")
+     endif()
diff --git a/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch b/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch
new file mode 100644
index 000000000000..7a706a084d0b
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch
@@ -0,0 +1,31 @@
+--- a/src/gui/CMakeLists.txt	2018-05-11 23:30:26.425509147 +0200
++++ b/src/gui/CMakeLists.txt	2018-05-11 23:31:53.237354182 +0200
+@@ -39,7 +39,7 @@
+     target_link_libraries (synergy dns_sd)
+ endif()
+ 
+-qt5_use_modules (synergy Core Widgets Network)
++target_link_libraries (synergy Qt5::Core Qt5::Widgets Qt5::Network)
+ target_compile_definitions (synergy PRIVATE -DSYNERGY_VERSION_STAGE="${SYNERGY_VERSION_STAGE}")
+ target_compile_definitions (synergy PRIVATE -DSYNERGY_REVISION="${SYNERGY_REVISION}")
+ 
+--- a/src/gui/src/ActionDialog.cpp	2018-04-10 12:18:42.000000000 +0200
++++ b/src/gui/src/ActionDialog.cpp	2018-05-11 23:33:50.814498692 +0200
+@@ -25,6 +25,7 @@
+ 
+ #include <QtCore>
+ #include <QtGui>
++#include <QButtonGroup>
+ 
+ ActionDialog::ActionDialog(QWidget* parent, ServerConfig& config, Hotkey& hotkey, Action& action) :
+     QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+--- a/src/gui/src/ScreenSetupView.cpp	2018-04-10 12:18:42.000000000 +0200
++++ b/src/gui/src/ScreenSetupView.cpp	2018-05-11 23:35:33.304496343 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include <QtCore>
+ #include <QtGui>
++#include <QHeaderView>
+ 
+ ScreenSetupView::ScreenSetupView(QWidget* parent) :
+     QTableView(parent)
diff --git a/x11-misc/synergy/synergy-1.6.3.ebuild b/x11-misc/synergy/synergy-1.6.3.ebuild
deleted file mode 100644
index ec6ab70007c5..000000000000
--- a/x11-misc/synergy/synergy-1.6.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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-core"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/${PV}.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 ~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/gtest-1.8.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-cryptopp.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
-}
diff --git a/x11-misc/synergy/synergy-1.8.6.ebuild b/x11-misc/synergy/synergy-1.8.6.ebuild
deleted file mode 100644
index 32a8d362ae13..000000000000
--- a/x11-misc/synergy/synergy-1.8.6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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-core"
-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 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="libressl qt4"
-RESTRICT="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}
-	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() {
-	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_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
-}
diff --git a/x11-misc/synergy/synergy-1.8.8.ebuild b/x11-misc/synergy/synergy-1.9.1.ebuild
index 9d978829cda8..dda9e9c3a8d1 100644
--- a/x11-misc/synergy/synergy-1.8.8.ebuild
+++ b/x11-misc/synergy/synergy-1.9.1.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
+EAPI=6
+
+inherit cmake-utils desktop gnome2-utils
 
 DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
-HOMEPAGE="http://synergy-project.org/ https://github.com/symless/synergy-core"
+HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core"
 SRC_URI="
-	https://github.com/symless/${PN}/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
+	https://github.com/symless/${PN}-core/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 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="libressl qt4"
+IUSE="libressl qt5"
 RESTRICT="test"
 
-S=${WORKDIR}/${P}-stable
+S=${WORKDIR}/${PN}-core-${PV}-stable
 
 COMMON_DEPEND="
 	!libressl? ( dev-libs/openssl:* )
@@ -31,9 +32,11 @@ COMMON_DEPEND="
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXtst
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
 		net-dns/avahi[mdnsresponder-compat]
 	)
 "
@@ -47,44 +50,33 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	qt4? ( !x11-misc/qsynergy )
+	qt5? ( !x11-misc/qsynergy )
 "
 
+DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.16_p1969-pthread.patch
-	"${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch
-	"${FILESDIR}"/${PN}-1.8.5-gtest.patch
+	"${FILESDIR}"/${P}-pthread.patch
+	"${FILESDIR}"/${P}-internal-gmock-gtest.patch
+	"${FILESDIR}"/${P}-gtest.patch
+	"${FILESDIR}"/${P}-cmake-version.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
 )
 
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
 src_configure() {
-	append-cxxflags ${mycmakeargs}
+	local mycmakeargs=(
+		-DSYNERGY_BUILD_LEGACY_GUI=$(usex qt5)
+		-DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
+	)
 
 	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} bin/syntool
+	dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool}
 
-	if use qt4 ; then
-		newbin bin/${PN} qsynergy
+	if use qt5 ; then
+		newbin "${BUILD_DIR}"/bin/${PN} qsynergy
 		newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png
 		make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
 	fi
@@ -95,17 +87,17 @@ src_install () {
 	newman doc/${PN}c.man ${PN}c.1
 	newman doc/${PN}s.man ${PN}s.1
 
-	dodoc README doc/synergy.conf.example* ChangeLog
+	einstalldocs
 }
 
 pkg_preinst() {
-	use qt4 && gnome2_icon_savelist
+	use qt5 && gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	use qt4 && gnome2_icon_cache_update
+	use qt5 && gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	use qt4 && gnome2_icon_cache_update
+	use qt5 && gnome2_icon_cache_update
 }