summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2010-04-13 21:39:17 +0000
committerLars Wendler <polynomial-c@gentoo.org>2010-04-13 21:39:17 +0000
commitada3869c431090de28cc8dbf8e55827e69e45193 (patch)
tree5fd93c9c2d969d6e5428207f57d10d4a3287d5fd /x11-base
parentStable on amd64 wrt bug #314007 (diff)
downloadgentoo-2-ada3869c431090de28cc8dbf8e55827e69e45193.tar.gz
gentoo-2-ada3869c431090de28cc8dbf8e55827e69e45193.tar.bz2
gentoo-2-ada3869c431090de28cc8dbf8e55827e69e45193.zip
Adding blocker for <x11-apps/xinit-1.2.1
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog7
-rw-r--r--x11-base/xorg-server/xorg-server-1.8.0.ebuild3
2 files changed, 8 insertions, 2 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 46f411c7c021..53e649c87ac3 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.501 2010/04/13 20:59:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.502 2010/04/13 21:39:17 polynomial-c Exp $
+
+ 13 Apr 2010; Lars Wendler <polynomial-c@gentoo.org>
+ xorg-server-1.8.0.ebuild:
+ Adding blocker for <x11-apps/xinit-1.2.1
+ Permission granted by scarabeus.
13 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
xorg-server-1.8.0.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.8.0.ebuild b/x11-base/xorg-server/xorg-server-1.8.0.ebuild
index 5dc2cd753cea..e5e892cec380 100644
--- a/x11-base/xorg-server/xorg-server-1.8.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.8.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.8.0.ebuild,v 1.4 2010/04/13 20:59:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.0.ebuild,v 1.5 2010/04/13 21:39:17 polynomial-c Exp $
EAPI=3
XORG_EAUTORECONF="yes"
@@ -56,6 +56,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
DEPEND="${RDEPEND}
!!net-dialup/dtrace
+ !<x11-apps/xinit-1.2.1
sys-devel/flex
>=x11-proto/bigreqsproto-1.1.0
>=x11-proto/compositeproto-0.4