Move xinit mask to base/ in order to be able to properly unmask in systemd target.

4 files changed, 19 insertions, 9 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 95bd38af2c9f..69b000999847 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9493 2014/10/26 16:44:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9494 2014/10/26 22:22:41 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!
 
   26 Oct 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  package.mask:
+  Move xinit mask to base/ in order to be able to properly unmask in systemd
+  target.
+
+  26 Oct 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   targets/systemd/package.mask:
   Unmask x11-apps/xinit-1.3.4 in systemd profiles
 
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 21577bd0f118..624d8cd6a6a6 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.738 2014/10/22 13:47:02 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.739 2014/10/26 22:22:41 chithanh Exp $
+
+  26 Oct 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  package.mask:
+  Move xinit mask to base/ in order to be able to properly unmask in systemd
+  target.
 
   22 Oct 2014; Brian Evans <grknight@gentoo.org> use.stable.mask:
   Mask php_targets_php5-6 until it is stable.
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 982aff074fc1..ee821868c4bf 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.66 2014/07/21 22:34:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.67 2014/10/26 22:22:41 chithanh Exp $
+
+# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (26 Oct 2014)
+# Changes in vt allocation break startx on non-systemd, bugs #526762 and
+# #526802.
+>=x11-apps/xinit-1.3.4
 
 # Rick Farina <zerochaos@gentoo.org> (6 Jun 2013)
 # Pm-utils based hibernate and suspend support has discontinued.
diff --git a/profiles/package.mask b/profiles/package.mask
index 3898d1d38c54..afb47aa3bf02 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16122 2014/10/26 16:36:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16123 2014/10/26 22:22:41 chithanh Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -30,11 +30,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (25 Oct 2014)
-# Changes in vt allocation break startx on non-systemd, bugs #526762 and
-# #526802.
->=x11-apps/xinit-1.3.4
-
 # Manuel Rüger <mrueg@gentoo.org> (25 Oct 2014)
 # Deprecated by upstream, Debian removed it in 2010.
 # Contents of this package moved to foomatic-db{,-engine,-ppds}