Version bump (bug #469294 by basti).

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

4 files changed, 182 insertions, 18 deletions

diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog
index a0e936be0b88..5253a6d577a3 100644
--- a/x11-misc/synergy/ChangeLog
+++ b/x11-misc/synergy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/synergy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.94 2013/03/02 23:53:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.95 2013/06/20 14:30:09 jer Exp $
+
+*synergy-1.4.12 (20 Jun 2013)
+
+  20 Jun 2013; Jeroen Roovers <jer@gentoo.org> +synergy-1.4.12.ebuild,
+  +files/synergy-1.4.12-cryptopp.patch:
+  Version bump (bug #469294 by basti).
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> synergy-1.4.10.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 40aee5c1d376..5445c2b638c4 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -4,33 +4,24 @@ 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.12-cryptopp.patch 1803 SHA256 aa7ec824b16b3e94fcbca23a0722d00520f248db85a9bb1b97feaa803bbb445f SHA512 5adb88c74b14464fa3f024ee67943f0f4e23f12afe0150045edc0261fba5befccb60542ff1b0fd5504fe8f49ef1dbd83387c5e967bc2c94854ae570e86c543de WHIRLPOOL 57b31f63833cafff8567223495978801ae1bf6cd34e13d0fb5297fca869bcb0060a9d6556b784d90c7f7530d9ef55b60b0830260b3cfa6a60070f2d89d02881d
 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.4.10-Source.tar.gz 3598533 SHA256 06d5a2ceb4cf8808cdab22441897c7b54ec8b4bc8351ac116f9accf54c720fbe SHA512 d8ebff1d53d16f6abb9cc64c7cd2ac5d6923b61ff3773f32d464cb58a0440bdbaa74836662d4c83e541516b4abda97f35855239cd12b6b095535fd38e36f238c WHIRLPOOL 86a8595403b5fb4efe88f4ea2cc528f541ea2cdb195254637ef077971ccc4cea3261d93fa2b8696fd39740a1421530c55099048399dbabe0e183f26da7a3c610
+DIST synergy-1.4.12-Source.tar.gz 3954996 SHA256 35b60c8d73368a0cb90daa629e64f66171b934a799a82427431979cca7260849 SHA512 5305e03d871e5408640ece55364067418f9b8b160dda31f994ebafe807b31291bdaa688a901f2e81710acb0857952c37f0c1823a50c927573feaec0c8659be9d WHIRLPOOL 1ba49a12ad5dc7853167c1ddcda032e876a94e9fa76e2250da96dea56353cdcd7bf00917346042aa7f737b3fd386da2d0b440e95d81f51f16d8fc3d3079c6b27
 DIST synergy-1.4.5-Source.tar.gz 3002836 SHA256 69e9ea11bdd05252886fe6a47fc43735bdc8a5af9dc2b843f4c34de1f0515ad1
 DIST synergy-1.4.7-Source.tar.gz 2998229 SHA256 e224d2ab822dc7b6e90a87587ed7d9e32f27d05efebc8430ecf61b3610baea3b
 DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
 EBUILD synergy-1.4.10.ebuild 1867 SHA256 a71bb6169664f4737bb0f44b8e41dc748e143fd813766cce3031b3365ed24bec SHA512 5e6590ca8e588113a78d2162b09b8ed427f1a2c550ae81d3a7f8cf51a733633c3d4d99c8197f40a164335cf8644ca94adc880e404f10c32c6ba40402f40bb5b3 WHIRLPOOL 83085e29e27cc3f675313a504f6a6a3dc0d2f91574d7bed874195b1366d161fc70e9c68b7831d61aae485ae736f3017f8c25b97106b8c550ce5648000f13838a
+EBUILD synergy-1.4.12.ebuild 1978 SHA256 4445274d3476f414e1b93682520e8f51d55f134ed44f70601ae8139bfdc4819a SHA512 17df5a049b5b5fc674a5f0f22f1327a7bc8fccf50f1750a3cdc3010d293dd2e93d51d7aef106e5b42f3dd3d0f759570fca6380cb8e734b65afb93f3110c3774e WHIRLPOOL 642b290042cbf8ce51c4fef8e605f177ba18b8a5133a3f63dac72cd88e04bc87978c61ed7731b08b551434392eb550468826cf9f753ed0595c4eb9c1b21079bf
 EBUILD synergy-1.4.5-r2.ebuild 1791 SHA256 210c26c3304a98b0a721f972e6123c6cf24ef8d2a2f4e2b6dc35ebaef4aa82f0 SHA512 67c5627f7832930291d42d4f10a12b69d179cbe0cd5c307b70bcc79e3fc512c261543cb3c9af3a6f86c8cf59315524e7296da94a31b2cca4ea8d02e6808eac57 WHIRLPOOL a5ec027bf9d34ab503df7bba380e2e659207854f4c44e76edc414a19b66bd19aeb806fd853a4cde46ba0c9473ccb8735a199ac38fa3eb40ef927c79bf38f6a7f
 EBUILD synergy-1.4.7.ebuild 1684 SHA256 93ef49bb9b71b4e62fe447883786648d7060871c23e40e0f0666769d22062b48 SHA512 7ea1270148256690e9c2c99fd8380e1e5a3530fe3a9ee44d75eec7a4a7d9167f983c7588fe422dbd0b18c6db17e0b4253545b436ee3e599dc7ce7d1e2a2d36b2 WHIRLPOOL 758cd93aebda71e6d526009428462ab5c3e5c462d110171d7bc6f158f9befb1995f05e8740f45f2f95e18ad5c1c46732dce1ae8bd61d28514055f316684ab970
-MISC ChangeLog 12885 SHA256 84f223acd9d950e5c38abb9d82c10701721146009daf8879edf61d9b20fca465 SHA512 a82055cad03dca44628bff7687b6c4137a5f0dbf486ecfdb0c875176db30fe2501f6e0161b40bb879323e2ebd95b6f075d7acc2efdf6e2b3fd2d108292c45e93 WHIRLPOOL 2820bda27ab27c13549e09ddbe6b9156b9a5bf8e0b00da21ed02d7132df56942d8a9d33c56303e465fd3441e09e75f174d2fdae8471c1286b3d1b32c758c2d73
+MISC ChangeLog 13062 SHA256 dd3d5345925de173f19ca44f91494fa08fc4f39c5c1aeff77e707431d5939e47 SHA512 ff25b27bd7dbf326c9dfd56fa08655b3167fffd90a435d0da2b13ed91c96eff414d5964a3400aa719ff1fcede1eb7eda294035203abc547cf72f7947279cc023 WHIRLPOOL 28357c9f7a5a88e66c1069a9cb8b853da11bfa1683dea7ab82a01325b83733fd633ac9517b3f78edd420f7944a7ee3d9ec1fc647fc992d9cde8352b19353c116
 MISC metadata.xml 243 SHA256 16d6a09278140777930f22eeaf42238d2a5168e539c14f8fd7b1b2be1132539c SHA512 86dc9a5aecb9dfdabe223750574bb8469e4dd4fb89e3ea5b2a683de1f68c5829460c60d16d8a748c17f2b6daf3561d054aa5283f6a37c52a8a60fba6ebbfce14 WHIRLPOOL 9e7beb2b0a4715dcd6a1d9d22c0ce9f82b9871dabdb2693dc4f11589bb0a1aa807855fdfda2d415b0807f5e31c3e4ced43e97e2c761c967452e5bc1e52e81df5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMpD9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88IsIQAJpa4ZuLbvxf4dnfPTL23ZoX
-qW/BEI6EU9tfBusiNXJzbozEQYmNw5E31PALfMC4j+sPrF5Jor8d62gxTLFCoi77
-E0mGBkHsTVW+XJ40JaUzzx9zFfMwDM1JZ0NPZee2n2bRKjc5YIXNMcQfNNdmSfoS
-IEXQqBtf7/bAreYgLwnp62113+QZzSEfy74mq13MeWgoakGBoyhvKfHqDCe0MR93
-bJYsC/2Z1Eg7OcYPJL0jIAfX/+ibe5vZl46BsP5PAf8Ju8/WRrjS1BLSCsOpKKb+
-8+HGVHm5FilG82uwuWHftGUSodzifXNmGB0YhL+IuZdwaJMAZSXc/jZfz+hsOY3b
-l3sI+BRFbM0H6XvDmgzveapf5/zEq9xfgC8opReUnGEG5PsCewGnYE/rgHr/yVy2
-du9ntOGJxdoQEyky8BmQ8tDWtushBl8dI9El98m9zjrjHTAL5XPKG/pMk081mrWI
-yJz+fnJgxfU+q0GOn27QxrNMTsiN4TYp8LFd/kAZGE84Ju7YlBrmV2fe+s2wDK5T
-ZTnoxwIbQUSzShXWb71ioFHCcsZcWwHxxzcAFFxjGCvkMIyjFfA/KMKpYh3SUVv5
-HxGqc/27AeF7yaArQRrjGmb4WtAvPGvkFbzONTLNFe8p5tstiBbRopbjgg7a9TTm
-1NBGvxPHPwKro4dmJ3vy
-=XEZT
+iEYEAREIAAYFAlHDEfMACgkQVWmRsqeSphNEcQCcD1FEXwVuD3MCenMYlL7MEzKQ
+pmkAn1xOdYuXt/whp7CTPovrNuLJZS7E
+=d4hV
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/synergy/files/synergy-1.4.12-cryptopp.patch b/x11-misc/synergy/files/synergy-1.4.12-cryptopp.patch
new file mode 100644
index 000000000000..3ed5b1864d67
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.12-cryptopp.patch
@@ -0,0 +1,74 @@
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -13,24 +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(cpp_dir cryptopp562)
+-
+-file(GLOB cpp_src ${cpp_dir}/*.cpp)
+-
+-if (WIN32)
+-	file(GLOB cpp_hdr ${cpp_dir}/*.h)
+-	list(APPEND cpp_src ${cpp_hdr})
+-endif()
+-
+-file(GLOB cpp_ignore
+-	${cpp_dir}/simple.cpp
+-	${cpp_dir}/strciphr.cpp
+-	${cpp_dir}/polynomi.cpp
+-	${cpp_dir}/eprecomp.cpp
+-	${cpp_dir}/eccrypto.cpp
+-	${cpp_dir}/algebra.cpp)
+-list(REMOVE_ITEM cpp_src ${cpp_ignore})
+-
+ # if 64-bit windows, compile asm file.
+ if (CMAKE_CL_64)
+ 	list(APPEND cpp_src ${cpp_dir}/x64dll.asm ${cpp_dir}/x64masm.asm)
+@@ -60,5 +42,3 @@
+ 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+ 	endif()
+ endif()
+-
+-add_library(cryptopp STATIC ${cpp_src})
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,6 +128,10 @@
+ 
+ 	endif()
+ 
++	set(CMAKE_REQUIRED_LIBRARIES crypto++)
++	set(CMAKE_REQUIRED_LIBRARIES)
++	set(CMAKE_INCLUDE_DIRECTORIES)
++
+ 	check_type_size(char SIZEOF_CHAR)
+ 	check_type_size(int SIZEOF_INT)
+ 	check_type_size(long SIZEOF_LONG)
+--- a/src/lib/synergy/CCryptoMode.h
++++ b/src/lib/synergy/CCryptoMode.h
+@@ -17,9 +17,9 @@
+ 
+ #pragma once
+ 
+-#include <cryptopp562/gcm.h>
+-#include <cryptopp562/modes.h>
+-#include <cryptopp562/aes.h>
++#include <crypto++/gcm.h>
++#include <crypto++/modes.h>
++#include <crypto++/aes.h>
+ #include "ECryptoMode.h"
+ #include "CString.h"
+ 
+--- a/src/lib/synergy/CCryptoStream.h
++++ b/src/lib/synergy/CCryptoStream.h
+@@ -20,8 +20,8 @@
+ #include "BasicTypes.h"
+ #include "CStreamFilter.h"
+ #include "CCryptoMode.h"
+-#include <cryptopp562/osrng.h>
+-#include <cryptopp562/sha.h>
++#include <crypto++/osrng.h>
++#include <crypto++/sha.h>
+ 
+ class CCryptoOptions;
+ 
diff --git a/x11-misc/synergy/synergy-1.4.12.ebuild b/x11-misc/synergy/synergy-1.4.12.ebuild
new file mode 100644
index 000000000000..2dcb3c1aa1ca
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.4.12.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.12.ebuild,v 1.1 2013/06/20 14:30:09 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-foss.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 ~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++
+	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}/${P}-cryptopp.patch" )
+
+S=${WORKDIR}/${P}-Source
+
+src_configure() {
+	cmake-utils_src_configure
+
+	if use qt4 ; then
+		cd src/gui
+		qt4-r2_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use qt4 ; then
+		cd src/gui
+		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
+
+	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
+
+	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
+}