Move xorg flag from make.defaults to package.use to avoid circular dependency between mesa and xorg-server.

5 files changed, 30 insertions, 24 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index f9d4eb70c9e5..95cd828ed010 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6848 2012/07/27 20:17:41 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6849 2012/07/27 20:23:42 chithanh Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  27 Jul 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  base/package.use, default/bsd/fbsd/make.defaults,
+  default/linux/make.defaults:
+  Move xorg flag from make.defaults to package.use to avoid circular dependency
+  between mesa and xorg-server.
+
   27 Jul 2012; Matti Bickel <mabi@gentoo.org> package.mask:
   removed www-apps/phpwiki
 
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 5d44bb09852f..d2469df99904 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.421 2012/07/26 22:13:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.422 2012/07/27 20:23:42 chithanh Exp $
+
+  27 Jul 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  package.use:
+  Add xorg to default flags for x11-base/xorg-server, sort newest first.
 
   26 Jul 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   package.use.mask:
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 4855038a5103..64f5c907dad4 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,19 +1,23 @@
-# 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/base/package.use,v 1.28 2011/04/10 23:02:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use,v 1.29 2012/07/27 20:23:42 chithanh Exp $
 
-# Zac Medico <zmedico@gentoo.org> (04 Dec 2009)
-# Bug #295615 - Disable cxx by default, in order to avoid a die
-# in pkg_setup with default USE settings (cxx requires sasl).
-net-nds/openldap -cxx
-
-# Doug Goldstein <cardoe@gentoo.org> (30 Aug 2010)
-# bug #332077 - Disable xcb backend by default for cairo-1.10. Its not
-# really prime time ready prior to cairo-1.10
-<x11-libs/cairo-1.10 -xcb
+# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (27 Jul 2012)
+# Modular X: Build the Xorg X server by default
+x11-base/xorg-server xorg
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (11 Apr 2011)
 # Disable ldap support by default in sudo, as it seem to lack
 # developers maintaining that particular support and is, thus, vastly
 # untested.
 app-admin/sudo -ldap
+
+# Doug Goldstein <cardoe@gentoo.org> (30 Aug 2010)
+# bug #332077 - Disable xcb backend by default for cairo-1.10. Its not
+# really prime time ready prior to cairo-1.10
+<x11-libs/cairo-1.10 -xcb
+
+# Zac Medico <zmedico@gentoo.org> (04 Dec 2009)
+# Bug #295615 - Disable cxx by default, in order to avoid a die
+# in pkg_setup with default USE settings (cxx requires sasl).
+net-nds/openldap -cxx
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"