diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-07-27 20:23:42 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-07-27 20:23:42 +0000 |
commit | 2a1f79450de6eb7c558fd66f0a0afa69e0cf6a7f (patch) | |
tree | f54f40d9fd2669d8469ac38e39133dcf2a941cc5 /profiles/default | |
parent | 0.8.62 version bump. (diff) | |
download | gentoo-2-2a1f79450de6eb7c558fd66f0a0afa69e0cf6a7f.tar.gz gentoo-2-2a1f79450de6eb7c558fd66f0a0afa69e0cf6a7f.tar.bz2 gentoo-2-2a1f79450de6eb7c558fd66f0a0afa69e0cf6a7f.zip |
Move xorg flag from make.defaults to package.use to avoid circular dependency between mesa and xorg-server.
Diffstat (limited to 'profiles/default')
-rw-r--r-- | profiles/default/bsd/fbsd/make.defaults | 6 | ||||
-rw-r--r-- | profiles/default/linux/make.defaults | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/profiles/default/bsd/fbsd/make.defaults b/profiles/default/bsd/fbsd/make.defaults index 4f26a5f5095d..f859e097dc1c 100644 --- a/profiles/default/bsd/fbsd/make.defaults +++ b/profiles/default/bsd/fbsd/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/make.defaults,v 1.12 2012/05/09 17:41:14 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/make.defaults,v 1.13 2012/07/27 20:23:42 chithanh Exp $ # Last building sandbox breaks gfind, bug #374425 FEATURES="-sandbox" @@ -17,10 +17,6 @@ USE="berkdb crypt iconv ipv6 ncurses nls oss pam pcre readline ssl tcpd zlib" # Modular X: Support direct rendering by default USE="${USE} dri" -# 2006/04/21 - Donnie Berkholz <dberkholz@gentoo.org> -# Modular X: Build the Xorg X server by default -USE="${USE} xorg" - # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org> # Defaults for video drivers VIDEO_CARDS="dummy fbdev vmware" diff --git a/profiles/default/linux/make.defaults b/profiles/default/linux/make.defaults index 63c3233fa47a..c7c6b97c9c58 100644 --- a/profiles/default/linux/make.defaults +++ b/profiles/default/linux/make.defaults @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/make.defaults,v 1.15 2011/10/05 19:22:13 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/make.defaults,v 1.16 2012/07/27 20:23:42 chithanh Exp $ # # System-wide defaults for the Portage system # See portage(5) manpage @@ -31,10 +31,6 @@ USE="${USE} dri" # isdn USE flag defaults USE="${USE} pppd" -# 2006/04/21 - Donnie Berkholz <dberkholz@gentoo.org> -# Modular X: Build the Xorg X server by default -USE="${USE} xorg" - # 2006/10/28 - Luca Barbato <lu_zero@gentoo.org> # on glibc system you cannot turn it off USE="${USE} iconv" |