summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-12-26 15:58:50 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-12-26 15:58:50 +0000
commitce616d00b30a8e01196b767f2809680b8c50a263 (patch)
tree2f3912019ac0ebe8f35a1cb6b49f86a18213c653 /media-libs/mesa
parentVersion bump. (diff)
downloadgentoo-2-ce616d00b30a8e01196b767f2809680b8c50a263.tar.gz
gentoo-2-ce616d00b30a8e01196b767f2809680b8c50a263.tar.bz2
gentoo-2-ce616d00b30a8e01196b767f2809680b8c50a263.zip
Do not depend on xorg-server.
(Portage version: 2.2_rc60/cvs/Linux i686)
Diffstat (limited to 'media-libs/mesa')
-rw-r--r--media-libs/mesa/ChangeLog5
-rw-r--r--media-libs/mesa/mesa-7.7.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 4efc6bfad5cb..cd7744360779 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/mesa
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.252 2009/12/24 13:17:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.253 2009/12/26 15:58:50 scarabeus Exp $
+
+ 26 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> mesa-7.7.ebuild:
+ Do not depend on xorg-server.
24 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> mesa-7.7.ebuild:
Rdepend on xorg-server[-minimal]. Thx to Tommy for reporting.
diff --git a/media-libs/mesa/mesa-7.7.ebuild b/media-libs/mesa/mesa-7.7.ebuild
index 47cfebca811b..3002805a8de7 100644
--- a/media-libs/mesa/mesa-7.7.ebuild
+++ b/media-libs/mesa/mesa-7.7.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/media-libs/mesa/mesa-7.7.ebuild,v 1.3 2009/12/24 13:17:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild,v 1.4 2009/12/26 15:58:50 scarabeus Exp $
EAPI="2"
@@ -44,10 +44,10 @@ IUSE="${IUSE_VIDEO_CARDS}
# keep correct libdrm and dri2proto dep
# keep blocks in rdepend for binpkg
RDEPEND="
+ !<x11-base/xorg-server-1.7
!<=x11-proto/xf86driproto-2.0.3
>=app-admin/eselect-opengl-1.1.1-r2
dev-libs/expat
- >=x11-base/xorg-server-1.7[-minimal]
>=x11-libs/libdrm-2.4.17
x11-libs/libICE
x11-libs/libX11[xcb?]
@@ -130,7 +130,7 @@ src_configure() {
elog " Svga: VMWare Virtual GPU driver."
echo
myconf="${myconf}
- --with-state-trackers=glx,dri,egl,xorg
+ --with-state-trackers=glx,dri,egl
$(use_enable video_cards_svga gallium-svga)
$(use_enable video_cards_nouveau gallium-nouveau)
$(use_enable video_cards_intel gallium-intel)"