diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-06-28 02:19:01 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-06-28 02:19:01 +0000 |
| commit | 485e67728b38bd785d511daf646482c8754bf7f2 (patch) | |
| tree | 6b5e77be8b3307ace2bbb78c397b986ce40dcede /x11-base | |
| parent | Change autoconf dependency to fix bug #138266. Added myself as maintainer. (diff) | |
| download | gentoo-2-485e67728b38bd785d511daf646482c8754bf7f2.tar.gz gentoo-2-485e67728b38bd785d511daf646482c8754bf7f2.tar.bz2 gentoo-2-485e67728b38bd785d511daf646482c8754bf7f2.zip | |
Only pull in loadable drivers if the xorg USE-flag is set. (bug #135873)
(Portage version: 2.1.1_pre1-r5)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 3c1dd4b03ee1..f13c5f3e904a 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-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.129 2006/06/27 03:49:50 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.130 2006/06/28 02:19:00 joshuabaergen Exp $ + + 27 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + Only pull in loadable drivers if the xorg USE-flag is set. (bug #135873) 26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> xorg-server-1.1.0-r1.ebuild: diff --git a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild index b67fb156df38..82b8c1b2d91b 100644 --- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.1.0-r1.ebuild,v 1.4 2006/06/27 03:49:50 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.5 2006/06/28 02:19:01 joshuabaergen Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -193,7 +193,7 @@ DEPEND="${RDEPEND} ############################################################################### ############################################################################### PDEPEND=" - || ( + xorg? ( || ( ( input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 ) input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 ) @@ -492,7 +492,7 @@ PDEPEND=" x86-fbsd? ( >=x11-drivers/xf86-video-vmware-10.13.0 ) ) - )" + ) )" LICENSE="${LICENSE} MIT" pkg_setup() { |