diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-10-29 10:50:10 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-10-29 10:50:10 +0000 |
| commit | f5d975ab7c6cc835b5f2fe9b8921e4b02dc30123 (patch) | |
| tree | a80f3cfa0e87238d2693dbbd8bb552a7a5bda2cd /x11-base | |
| parent | x11-base/xorg-server: sync with the overlay, update dmx deps (fixes bug #290866) (diff) | |
| download | gentoo-2-f5d975ab7c6cc835b5f2fe9b8921e4b02dc30123.tar.gz gentoo-2-f5d975ab7c6cc835b5f2fe9b8921e4b02dc30123.tar.bz2 gentoo-2-f5d975ab7c6cc835b5f2fe9b8921e4b02dc30123.zip | |
Add proper blockers for xorg-7.5 stuff we dont want with xorg-server-1.6. Per bug #290739.
(Portage version: 2.2_rc46/cvs/Linux i686, RepoMan options: --force)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.6.5.ebuild | 29 |
2 files changed, 33 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index bbc6e92e7d10..1e90dcd52ab9 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,10 +1,15 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.459 2009/10/29 10:45:04 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.460 2009/10/29 10:50:10 scarabeus Exp $ 29 Oct 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.7.1.ebuild: sync with the overlay, update dmx deps (fixes bug #290866) + 29 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.6.5.ebuild: + Add proper blockers for xorg-7.5 stuff we dont want with xorg-server-1.6. + Per bug #290739. + 26 Oct 2009; Jeroen Roovers <jer@gentoo.org> xorg-server-1.6.3.901-r2.ebuild: Stable for HPPA (bug #282290). diff --git a/x11-base/xorg-server/xorg-server-1.6.5.ebuild b/x11-base/xorg-server/xorg-server-1.6.5.ebuild index 911ec9c5b011..4cf4b1cbfe17 100644 --- a/x11-base/xorg-server/xorg-server-1.6.5.ebuild +++ b/x11-base/xorg-server/xorg-server-1.6.5.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-base/xorg-server/xorg-server-1.6.5.ebuild,v 1.1 2009/10/12 08:19:07 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.5.ebuild,v 1.2 2009/10/29 10:50:10 scarabeus Exp $ EAPI="2" @@ -19,7 +19,32 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86- IUSE_SERVERS="dmx kdrive xorg" IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" -RDEPEND="hal? ( sys-apps/hal ) + +RDEP_XORG_BLOCKERS="!>=x11-apps/xinput-1.5.0 + !>=x11-base/xorg-drivers-1.7 + !>=x11-base/xorg-server-1.7.1 + !>=x11-libs/libX11-1.3.2 + !>=x11-libs/libXScrnSaver-1.2.0 + !>=x11-libs/libXext-1.1.1 + !>=x11-libs/libXi-1.3 + !>=x11-libs/libXinerama-1.1 + !>=x11-libs/libXtst-1.1.0 + !>=x11-libs/libXxf86dga-1.1.1 + !>=x11-libs/libXxf86vm-1.1.0 + !>=x11-proto/bigreqsproto-1.1.0 + !>=x11-proto/fixesproto-4.1.1 + !>=x11-proto/inputproto-2.0 + !>=x11-proto/recordproto-1.14 + !>=x11-proto/scrnsaverproto-1.2.0 + !>=x11-proto/xcmiscproto-1.2.0 + !>=x11-proto/xextproto-7.1.1 + !>=x11-proto/xf86bigfontproto-1.2.0 + !>=x11-proto/xf86dgaproto-2.1 + !>=x11-proto/xf86driproto-2.1.0 + !>=x11-proto/xf86vidmodeproto-2.3 + !>=x11-proto/xineramaproto-1.2" +RDEPEND="${RDEP_XORG_BLOCKERS} + hal? ( sys-apps/hal ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) dev-libs/openssl >=x11-libs/libXfont-1.4.0 |