summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-12-26 16:01:58 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-12-26 16:01:58 +0000
commit5ecc23482a829c0d470957880c261a7e8c7d8819 (patch)
treecf0adc42aef1ae073e7cb413ba0f7211866cd93a /x11-base
parentDo not depend on xorg-server. (diff)
downloadgentoo-2-5ecc23482a829c0d470957880c261a7e8c7d8819.tar.gz
gentoo-2-5ecc23482a829c0d470957880c261a7e8c7d8819.tar.bz2
gentoo-2-5ecc23482a829c0d470957880c261a7e8c7d8819.zip
Depend correctly on mesa again.
(Portage version: 2.2_rc60/cvs/Linux i686)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild6
2 files changed, 8 insertions, 4 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 53a160d8b972..e8f0d4f51bb5 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
# 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.477 2009/12/24 13:17:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.478 2009/12/26 16:01:58 scarabeus Exp $
+
+ 26 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ xorg-server-1.7.3.901-r1.ebuild:
+ Depend correctly on mesa again.
24 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
-xorg-server-1.7.3.ebuild, -xorg-server-1.7.3.901.ebuild,
diff --git a/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild b/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild
index c0bcb90cf4e4..c20e3de67849 100644
--- a/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.3.901-r1.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.7.3.901-r1.ebuild,v 1.2 2009/12/24 13:17:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild,v 1.3 2009/12/26 16:01:58 scarabeus Exp $
EAPI="2"
@@ -52,6 +52,7 @@ RDEPEND="hal? ( sys-apps/hal )
>=x11-libs/libX11-1.1.5
>=x11-libs/libXext-1.0.5
>=x11-libs/libXres-1.0.3
+ >=media-libs/mesa-7.4[nptl=]
)
>=x11-libs/libxkbui-1.0.2
kdrive? (
@@ -112,8 +113,7 @@ DEPEND="${RDEPEND}
>=x11-libs/libdrm-2.3.0
)"
-PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )
- !minimal? ( >=media-libs/mesa-7.4[nptl=] )"
+PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
EPATCH_FORCE="yes"
EPATCH_SUFFIX="patch"