diff options
| -rw-r--r-- | x11-libs/libXext/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libXext/libXext-1.1.1.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-libs/libXext/ChangeLog b/x11-libs/libXext/ChangeLog index 832ceb35eafd..4454054cd60d 100644 --- a/x11-libs/libXext/ChangeLog +++ b/x11-libs/libXext/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libXext # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/ChangeLog,v 1.65 2009/10/26 21:01:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/ChangeLog,v 1.66 2009/10/31 21:42:03 zmedico Exp $ + + 31 Oct 2009; Zac Medico <zmedico@gentoo.org> libXext-1.1.1.ebuild: + Add blocker for <xextproto-7.1.1, to avoid file collisions when merging + binary packages. 26 Oct 2009; Jeroen Roovers <jer@gentoo.org> libXext-1.0.5.ebuild: Stable for HPPA (bug #282290). diff --git a/x11-libs/libXext/libXext-1.1.1.ebuild b/x11-libs/libXext/libXext-1.1.1.ebuild index a8d361c2632e..a3875536607e 100644 --- a/x11-libs/libXext/libXext-1.1.1.ebuild +++ b/x11-libs/libXext/libXext-1.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/libXext/libXext-1.1.1.ebuild,v 1.1 2009/10/25 20:32:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.1.1.ebuild,v 1.2 2009/10/31 21:42:03 zmedico Exp $ inherit x-modular @@ -9,7 +9,9 @@ DESCRIPTION="X.Org Xext library" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="" -RDEPEND=">=x11-libs/libX11-1.1.99.1" -DEPEND="${RDEPEND} +COMMON_DEPEND=">=x11-libs/libX11-1.1.99.1" +RDEPEND="${COMMON_DEPEND} + !<x11-proto/xextproto-7.1.1" +DEPEND="${COMMON_DEPEND} >=x11-proto/xextproto-7.0.99.2 >=x11-proto/xproto-7.0.13" |