diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-11-01 20:42:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-01 20:42:35 +0000 |
| commit | d0a6e5da3ef963368e535029c463ed5303e261af (patch) | |
| tree | e268e98920bf92e8fa24630a95bc1359463616b4 /x11-libs | |
| parent | Make USE=qt-static preferable for builds that misbehave with Qt 4.5.3 (bug #2... (diff) | |
| download | gentoo-2-d0a6e5da3ef963368e535029c463ed5303e261af.tar.gz gentoo-2-d0a6e5da3ef963368e535029c463ed5303e261af.tar.bz2 gentoo-2-d0a6e5da3ef963368e535029c463ed5303e261af.zip | |
Block older versions of scrnsaverproto, in order to avoid file collisions when installing from binary packages.
(Portage version: 2.2_rc48/cvs/Linux i686)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libXScrnSaver/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-libs/libXScrnSaver/ChangeLog b/x11-libs/libXScrnSaver/ChangeLog index b255b6868a92..a56782053aa1 100644 --- a/x11-libs/libXScrnSaver/ChangeLog +++ b/x11-libs/libXScrnSaver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libXScrnSaver # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog,v 1.59 2009/10/03 15:10:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog,v 1.60 2009/11/01 20:42:35 zmedico Exp $ + + 01 Nov 2009; Zac Medico <zmedico@gentoo.org> libXScrnSaver-1.2.0.ebuild: + Block older versions of scrnsaverproto, in order to avoid file collisions + when installing from binary packages. *libXScrnSaver-1.2.0 (03 Oct 2009) diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild index 2e7a13d7f14e..c0e29c4aadae 100644 --- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild +++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild,v 1.1 2009/10/03 15:10:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild,v 1.2 2009/11/01 20:42:35 zmedico Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -11,7 +11,9 @@ DESCRIPTION="X.Org XScrnSaver library" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="" -RDEPEND="x11-libs/libX11 +COMMON_DEPEND="x11-libs/libX11 x11-libs/libXext" -DEPEND="${RDEPEND} +RDEPEND="${COMMON_DEPEND} + !<x11-proto/scrnsaverproto-1.2" +DEPEND="${COMMON_DEPEND} >=x11-proto/scrnsaverproto-1.2" |