summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-31 21:42:03 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-31 21:42:03 +0000
commit9f4bdbbf95943e0a89298bae7f9faa34ddaf16ef (patch)
treeb028d6f570c092605cb6c7e07201e6713a30ddc0 /x11-libs/libXext/libXext-1.1.1.ebuild
parentrespect my FLAGS (diff)
downloadhistorical-9f4bdbbf95943e0a89298bae7f9faa34ddaf16ef.tar.gz
historical-9f4bdbbf95943e0a89298bae7f9faa34ddaf16ef.tar.bz2
historical-9f4bdbbf95943e0a89298bae7f9faa34ddaf16ef.zip
Add blocker for <xextproto-7.1.1, to avoid file collisions when merging binary packages.
Package-Manager: portage-2.2_rc48/cvs/Linux i686
Diffstat (limited to 'x11-libs/libXext/libXext-1.1.1.ebuild')
-rw-r--r--x11-libs/libXext/libXext-1.1.1.ebuild8
1 files changed, 5 insertions, 3 deletions
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"