diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2011-11-22 16:38:20 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2011-11-22 16:38:20 +0000 |
| commit | 252e2eea132d23dba8fc9db8e9ad76170eb32c1c (patch) | |
| tree | d0174baaec92f0d14590ef307d7a53a7867bb47b /x11-misc/synergy | |
| parent | Old. (diff) | |
| download | historical-252e2eea132d23dba8fc9db8e9ad76170eb32c1c.tar.gz historical-252e2eea132d23dba8fc9db8e9ad76170eb32c1c.tar.bz2 historical-252e2eea132d23dba8fc9db8e9ad76170eb32c1c.zip | |
block x11-misc/qsynergy, bug 357505 by Jan-Matthias Braun
Package-Manager: portage-2.1.10.34/cvs/Linux x86_64
Diffstat (limited to 'x11-misc/synergy')
| -rw-r--r-- | x11-misc/synergy/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/synergy/Manifest | 6 | ||||
| -rw-r--r-- | x11-misc/synergy/synergy-1.4.2.ebuild | 5 | ||||
| -rw-r--r-- | x11-misc/synergy/synergy-1.4.5.ebuild | 5 |
4 files changed, 14 insertions, 8 deletions
diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog index 7f5d2a36bd1e..3d285b361f84 100644 --- a/x11-misc/synergy/ChangeLog +++ b/x11-misc/synergy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/synergy # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.68 2011/11/22 16:29:40 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.69 2011/11/22 16:38:20 darkside Exp $ + + 22 Nov 2011; Jeremy Olexa <darkside@gentoo.org> synergy-1.4.2.ebuild, + synergy-1.4.5.ebuild: + block x11-misc/qsynergy, bug 357505 by Jan-Matthias Braun *synergy-1.4.5 (22 Nov 2011) diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest index efca56fce713..1071f4876e28 100644 --- a/x11-misc/synergy/Manifest +++ b/x11-misc/synergy/Manifest @@ -7,7 +7,7 @@ DIST synergy-1.4.2-Source.tar.gz 868390 RMD160 6dc54750cc9337bbb7c041436adae51bf DIST synergy-1.4.5-Source.tar.gz 3002836 RMD160 cf45a71590d5cf4cca225be7b25566de68eb1404 SHA1 18a942f4a939ff75415961fbc48fe2e2596a7bcf SHA256 69e9ea11bdd05252886fe6a47fc43735bdc8a5af9dc2b843f4c34de1f0515ad1 EBUILD synergy-1.3.1.ebuild 1427 RMD160 5fd8e2b3c2e4adbfa10a79d9a608f8a41fa6d777 SHA1 987920d242b123b19cca0c637f2bd6eb8e5ff2a7 SHA256 3c6f65e2d4284ce44add8f33d224d7a44c3cf6c4f7783f0a73004bb8346a36fe EBUILD synergy-1.3.6.ebuild 1092 RMD160 15f67078a6a3cf2dbaa161e4d4ad6e4480cf4730 SHA1 be93d00e8c208ae0cd9d22dedd0f059bc750a66d SHA256 6cdba19e2514949390be3c65af30365de730da4624b92f6031bd85600541e6f6 -EBUILD synergy-1.4.2.ebuild 1528 RMD160 283b3cc83fda66d2c86406a2dd504ee3bfaa767c SHA1 b9cca1a1bb57d0259397511dec00b8b375716491 SHA256 7024dcecfe9c255630a7dd4c6500e6fe165fcc527086e3393b3ac042a94448d9 -EBUILD synergy-1.4.5.ebuild 1636 RMD160 626803762ab2b21127c79c64216b349d1078f5e2 SHA1 13cef71394688691e69e6f6c2d590ce547033db5 SHA256 ab271ef7aa3938a1c5149dd78aad108a43c79bd5d07080afc2f0e01febcfff7d -MISC ChangeLog 9217 RMD160 df1fe097bd0068917b02169bb6b4c44fd220f352 SHA1 78ba7bb0b797e4e09101ecca21426d4b7e4bafa2 SHA256 9618f11713c9fb04b91a6fb34c9d32431c1f28543033f2f1b097a17c2fc5c0a6 +EBUILD synergy-1.4.2.ebuild 1562 RMD160 e37a5e47cbe754d69de986c5cc272c4fdffb44ce SHA1 efa436ab8ec8b3a5a7a9e6c1314260540c6ce58e SHA256 9e41938d68c0aaf0f4148d7f8a3cca4f914ad38276698bb76a7ce6ecd37ec97b +EBUILD synergy-1.4.5.ebuild 1665 RMD160 0e6aefbde095b0c7e46ef317a4180307231bd802 SHA1 c377e89b7b77fd459e324757980830a92812788c SHA256 da002f139865d45b6ee9be9f544c35d991d8717aef8d5e9ea981719bc8c8366c +MISC ChangeLog 9374 RMD160 0fead64039aa6dd00730ba4b5568b54299d1bb7f SHA1 701c1329b55b997a2a71e8627c23f691126cf4bc SHA256 afce305844e20b8b8f7ae81ffe92f43778d7f8144687168df574b91f05b72639 MISC metadata.xml 235 RMD160 fc62e96fe011b16210ab733a4ad8ea9c126fad91 SHA1 28b4e1e1b7086feb881d1d301e47200bcdab3ec0 SHA256 c232364986971636acb82c929ed2cf63881ed3f51ce439d8c4a7a5af34397378 diff --git a/x11-misc/synergy/synergy-1.4.2.ebuild b/x11-misc/synergy/synergy-1.4.2.ebuild index e3c579d66fe7..320dd505e42c 100644 --- a/x11-misc/synergy/synergy-1.4.2.ebuild +++ b/x11-misc/synergy/synergy-1.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.1 2011/02/28 22:38:21 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.2.ebuild,v 1.2 2011/11/22 16:38:20 darkside Exp $ EAPI=3 @@ -19,7 +19,8 @@ RDEPEND="x11-libs/libXtst x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama - qt4? ( x11-libs/qt-gui )" + qt4? ( x11-libs/qt-gui ) + qt4? ( !x11-misc/qsynergy )" DEPEND="${RDEPEND} x11-proto/xextproto x11-proto/xproto diff --git a/x11-misc/synergy/synergy-1.4.5.ebuild b/x11-misc/synergy/synergy-1.4.5.ebuild index 50e22bf73fce..7533d85e5fdc 100644 --- a/x11-misc/synergy/synergy-1.4.5.ebuild +++ b/x11-misc/synergy/synergy-1.4.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.5.ebuild,v 1.1 2011/11/22 16:29:40 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.5.ebuild,v 1.2 2011/11/22 16:38:20 darkside Exp $ EAPI=4 @@ -19,7 +19,8 @@ RDEPEND="x11-libs/libXtst x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama - qt4? ( x11-libs/qt-gui )" + qt4? ( x11-libs/qt-gui ) + qt4? ( !x11-misc/qsynergy )" DEPEND="${RDEPEND} x11-proto/xextproto x11-proto/xproto |