reinit the tree, so we can have metadata

13 files changed, 605 insertions, 0 deletions

diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
new file mode 100644
index 000000000000..4ebad7044315
--- /dev/null
+++ b/x11-misc/synergy/Manifest
@@ -0,0 +1,18 @@
+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
+AUX synergy-1.7.5-gentoo.patch 396 SHA256 2900c98e8063b764dae4b67637d99ecfdf1b094addd20b6869eb888f92e62503 SHA512 2ca7a5f36f7fc0949c6832506efb8d8516390ff5f238c14dc600ec03f28f5691e3102753db8c4986a5445950b3154e1410d40e3cc1974a2b9b84476ad77f0e83 WHIRLPOOL 583e8b8bdc0abfc1962783b40c00387c1c972c0a5443e0f45e4c4cfc7cbd31edf138641bcecfa509a647f7ffbfd1bf6bb68510a4c78d3b81cd53b27df4af8ec8
+AUX synergy-1.8.1-internal-gmock-gtest.patch 737 SHA256 bedabafa830bd1b6ef8eba4d97f53c7a0e74acc1cd47498930ac07c69c0ee72d SHA512 cec725312fea90d3df62957e16fef25c7988f50569a99e80b9d6724fb0f100211820256143f87b02099aa5fffa1d434ce71638f88e225cb6f0fa9a597d2074cc WHIRLPOOL 8cbf0e951cfd3ac76271852cfe2ff12909a902ae77e3d570890a6719efdd6469e54bdf1d0ac7a954c86bdc42579d3fd5a8241e26684ed7d8446522b7cf7cc03f
+AUX synergy-1.8.5-gtest.patch 970 SHA256 09b882c54fd76bd478403a94e61972e8ecbe53c7819b9717cae775256882f707 SHA512 eeca2d45bb3c589fe7d524bd91ef45d0478552d0d1e2922dcb58f2a4e3b45cb9830f4956d3909333c20e0bcbf0de5e016ef78eddac22c2ab7394b2c0670e6e8b WHIRLPOOL 32fa694aa0b28d1573b636074cb77190ffe91b22f9197c79d32cd8642b790be09292d45cd583c459c25e307977f62213a0aef8fb7f2332d20311de75d56d2066
+DIST synergy-1.6.3.tar.gz 4405517 SHA256 93b1965b8e0cfc55cc654aab7053a58b9e730d09e68bbc520be32353a01dce1a SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165 WHIRLPOOL cb8737f0fe75105c9f5c8c371a5aef55c5eb8f1c419b3a7315ed66880e79c379efc6d7bced20c0d046bc281be935322def54f98d67e383d7236620a948ae1c14
+DIST synergy-1.8.6.tar.gz 13497043 SHA256 76b27c6e90961ee6bdad429904a2d5743854d0d027c067941d2411565d64352b SHA512 e0816c280c77d4a865f4b7d4a9081963032a156bfb6da51e6b67a6fc41f8f18b097d3fc7c96218db268c36d0148021f9ddba95fe56daff8bfc54219dbdfe14a5 WHIRLPOOL c12a0038f931963afee8190799dd74dcb300cbb79c2870d1a8a2e33238a86cc0ef30e5b577fdda05d7880e488d3c03da6a48c6a22095b2f4b312fc851325376a
+DIST synergy-1.8.8.tar.gz 13498599 SHA256 85c388f93881d741981ce3c675e840a52a76883cb2cea1da306c0c453c5d7d9b SHA512 b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6 WHIRLPOOL 1e03d6b4463d924477637170a57acfe9238f2b3d5d099cad8b3e65eb473fc7407075afc9859e05d5a818bd27a9723d64bf8cf0d99d950282de490d63f745ab56
+DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
+EBUILD synergy-1.6.3.ebuild 2406 SHA256 c9a98a31a3ad5c72437fe263a5d7744a07dc7c584c8ad7fd5b3e174a77b1fb84 SHA512 8979d5e0541eea94e80d653af332ba013b270710fadc2125db70381c738ae56e4f1e5fc156b637d59b34b3074a9f084ada93aa056005c47167594ae0cb7a3ccd WHIRLPOOL 0896a2fdedf792eb129b8c6fa4e4734827dab27d9297797488944451f82a9a14d1ebdf07501fcd4c363ec713bd735710474306ecf1b17f12775c353ce6f62b44
+EBUILD synergy-1.8.6.ebuild 2255 SHA256 6037ec61a3910a82215efd03aa4edac4154aca12ab04216bfb9a00807cf45776 SHA512 f0109385bdf1be9e758bdfccf16c0e364423c3baf81e8506ea9eece2be26be402c36f72e913c823dec972283af643b2404ae5d7089f254e430ab9d26187d68da WHIRLPOOL e126c50f36dad8681a4f0dea6dd325a5b51927071db35ccbc13c3f64c01b354c5ef8331a4b9d54f4453a5b98173ef30acf7a279a2e6765077e594df29e417242
+EBUILD synergy-1.8.8.ebuild 2215 SHA256 03d0202c18b0f22d4706b9e196d82b6a74c997c3e2491f228338acf5949c9b94 SHA512 20ea1c4d68a061a97146f6de4b126359401ba0af77eba8edc97dc0cf181fff71a47611b7d5a0acf3123b93b750857ceefe3f716f16c0c737f9b473fe3cbe16a3 WHIRLPOOL da11bc47de3cdc3e8747202bd469de89f1b9805c807ba8cae61f6029e508c73f00c8fde72a6929d504d28208affaecad1b1bd663f138358e508f8769d304709a
+MISC ChangeLog 5633 SHA256 eb2a2664d7c26cc7bf5817fa87c24123e2bbb4d988d1842bab72ee74e3270128 SHA512 4736bd06568f5ff76b386a896e2df56574e00a5b751c7c3409158b4449c9b59a6fa3059ca658285b0ce5d8221815a8639744a2a7a2e61652750901f14e56d6d5 WHIRLPOOL 362b6bb72c67370d154e147cee7439a353ac1aacb0ae216c130e29f0bfa3bf6cf731555f68f80822e5435ca5628095649b32ee9fee22e573ed00ea70ec0a7617
+MISC ChangeLog-2015 18869 SHA256 caf5fe851c88bb36d54ce05d7a590c1760fd497d7360c6b34b0f6abe743af822 SHA512 df3af020e364df58d84c0d136b29296de91be3c9e52b389c131ee5a19c527738a0c423ccef6419a77a94a68868ac220e9c02adc90b2c33230fd03249e3e150a8 WHIRLPOOL 2c1f8a6f67bb28f2547ce4ef19e06dce62ec895bfb1c5e323cb83b0d5ea295d32c889a4e54114ae6af78c0ee20e2a514a1fa0b42ed597b6a182db5498f805455
+MISC metadata.xml 408 SHA256 407fa5a4183b5c39282f125425a178abc71bb8890efa140d9d5d4f8ec1c21c94 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7 WHIRLPOOL 53c6ee0f9bea7578d65be204fbb758893885b58787813262727d633b99141175020e6c0be9b6200bf7b24e93eb8745ab10802906b7758692bd87cc0a4340671f
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
new file mode 100644
index 000000000000..adddf2f73b67
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.16_p1969-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.4.17_p2055-CSocketMultiplexer.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch
new file mode 100644
index 000000000000..0e99fd3bce5d
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000000..59f85a9c29a0
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch
@@ -0,0 +1,96 @@
+--- 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
new file mode 100644
index 000000000000..89f46f3c9af0
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..e0e25c2e128b
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch
@@ -0,0 +1,33 @@
+--- 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
new file mode 100644
index 000000000000..9c508f68eeef
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.7.5-gentoo.patch
@@ -0,0 +1,11 @@
+--- 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
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/files/synergy-1.8.5-gtest.patch b/x11-misc/synergy/files/synergy-1.8.5-gtest.patch
new file mode 100644
index 000000000000..c9eaa5164190
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.8.5-gtest.patch
@@ -0,0 +1,38 @@
+--- a/src/lib/synergy/KeyMap.h	2016-11-09 13:21:52.000000000 -0600
++++ b/src/lib/synergy/KeyMap.h	2016-11-09 13:22:17.484457330 -0600
+@@ -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	2016-11-09 13:31:26.000000000 -0600
++++ b/src/CMakeLists.txt	2016-11-09 13:40:08.189421727 -0600
+@@ -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/metadata.xml b/x11-misc/synergy/metadata.xml
new file mode 100644
index 000000000000..11c61fc68912
--- /dev/null
+++ b/x11-misc/synergy/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">synergy</remote-id>
+		<remote-id type="github">synergy/synergy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/synergy/synergy-1.6.3.ebuild b/x11-misc/synergy/synergy-1.6.3.ebuild
new file mode 100644
index 000000000000..266180f7bbae
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.6.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 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/synergy/synergy"
+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/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-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
new file mode 100644
index 000000000000..331f31656127
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.8.6.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 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"
+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.8.8.ebuild
new file mode 100644
index 000000000000..1bbe611323a0
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.8.8.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 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"
+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.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
+}