diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-06-20 21:56:07 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-06-20 21:56:07 +0000 |
commit | 7249fb1f6b6af61e7cbf1cd4f8e644d60f4761ad (patch) | |
tree | 387ec9dcc0cafc48af48ceafa4568702122495fa /x11-base/xorg-server | |
parent | Version bump to 0.2.9.4 as requested by jkt on bug #372403. Remove older rele... (diff) | |
download | gentoo-2-7249fb1f6b6af61e7cbf1cd4f8e644d60f4761ad.tar.gz gentoo-2-7249fb1f6b6af61e7cbf1cd4f8e644d60f4761ad.tar.bz2 gentoo-2-7249fb1f6b6af61e7cbf1cd4f8e644d60f4761ad.zip |
Depend on console browser when building dmx documentation, bug #372383.
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.10.2.ebuild | 15 |
2 files changed, 18 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 4c2bf56c3c0f..f6ff70a537bd 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.592 2011/06/09 21:40:37 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.593 2011/06/20 21:56:07 chithanh Exp $ + + 20 Jun 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + xorg-server-1.10.2.ebuild: + Depend on console browser when building dmx documentation, bug #372383. 09 Jun 2011; Matt Turner <mattst88@gentoo.org> xorg-server-1.9.4.ebuild, xorg-server-1.9.5.ebuild, xorg-server-1.10.2.ebuild, diff --git a/x11-base/xorg-server/xorg-server-1.10.2.ebuild b/x11-base/xorg-server/xorg-server-1.10.2.ebuild index 950873222e8f..8ace975b8a5e 100644 --- a/x11-base/xorg-server/xorg-server-1.10.2.ebuild +++ b/x11-base/xorg-server/xorg-server-1.10.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.10.2.ebuild,v 1.2 2011/06/09 21:40:37 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.2.ebuild,v 1.3 2011/06/20 21:56:07 chithanh Exp $ EAPI=4 @@ -55,6 +55,8 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8 udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3" +# dmx+doc DEPEND is a hack, a proper solution needs to be implemented in the +# xorg-2.eclass for next release DEPEND="${RDEPEND} sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 @@ -79,7 +81,16 @@ DEPEND="${RDEPEND} >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.17 - dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 |