diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-11-01 20:26:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-01 20:26:30 +0000 |
| commit | d336eaef801e35eadd1607699c578a354a1e9bec (patch) | |
| tree | fe2b65e5ea7d62c3a4ac405dd681e510eadfa8bf /x11-libs/libXinerama | |
| parent | Remove java last rites that were removed. (diff) | |
| download | gentoo-2-d336eaef801e35eadd1607699c578a354a1e9bec.tar.gz gentoo-2-d336eaef801e35eadd1607699c578a354a1e9bec.tar.bz2 gentoo-2-d336eaef801e35eadd1607699c578a354a1e9bec.zip | |
Block older versions of xineramaproto, in order to avoid file collisions when installing from binary packages.
(Portage version: 2.2_rc48/cvs/Linux i686)
Diffstat (limited to 'x11-libs/libXinerama')
| -rw-r--r-- | x11-libs/libXinerama/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libXinerama/libXinerama-1.1.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-libs/libXinerama/ChangeLog b/x11-libs/libXinerama/ChangeLog index 504be92694e8..fc98f9e883a8 100644 --- a/x11-libs/libXinerama/ChangeLog +++ b/x11-libs/libXinerama/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libXinerama # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/ChangeLog,v 1.49 2009/10/03 15:29:10 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/ChangeLog,v 1.50 2009/11/01 20:26:30 zmedico Exp $ + + 01 Nov 2009; Zac Medico <zmedico@gentoo.org> libXinerama-1.1.ebuild: + Block older versions of xineramaproto, in order to avoid file collisions + when installing from binary packages. *libXinerama-1.1 (03 Oct 2009) diff --git a/x11-libs/libXinerama/libXinerama-1.1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.ebuild index 6b0b00cfe62d..bcff1b3f6130 100644 --- a/x11-libs/libXinerama/libXinerama-1.1.ebuild +++ b/x11-libs/libXinerama/libXinerama-1.1.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/libXinerama/libXinerama-1.1.ebuild,v 1.1 2009/10/03 15:29:10 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.ebuild,v 1.2 2009/11/01 20:26:30 zmedico Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -11,8 +11,10 @@ DESCRIPTION="X.Org Xinerama 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/xineramaproto-1.2" +DEPEND="${COMMON_DEPEND} x11-proto/xextproto >=x11-proto/xineramaproto-1.2" |