diff options
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/synergy/ChangeLog | 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 |
3 files changed, 11 insertions, 5 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/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 |