Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and future versions of sys-apps/portage.

2 files changed, 42 insertions, 30 deletions

diff --git a/profiles/selinux/package.mask b/profiles/selinux/package.mask
index 50bb1ae0e94e..f10697fe38e2 100644
--- a/profiles/selinux/package.mask
+++ b/profiles/selinux/package.mask
@@ -1,4 +1,44 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.63 2011/08/07 11:07:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.64 2011/08/09 04:29:56 zmedico Exp $
+
+# Zac Medico <zmedico@gentoo.org> (09 Aug 2011)
+# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and
+# future versions of sys-apps/portage.
+##############################################################################
+# Basic SELinux required versionings
+
+# Core Packages
+<sys-apps/portage-2.0.49-r15
+<sys-apps/baselayout-1.8.6.12-r2
+<sys-libs/glibc-2.3
+<sys-libs/uclibc-0.9.26-r8
+<sys-kernel/linux-headers-2.4.20
+
+# SELinux-aware packages
+<net-misc/openssh-3.7.1_p2
+<sys-apps/coreutils-5.0.91
+<sys-apps/findutils-4.1.20-r1
+<sys-apps/shadow-4.0.3-r7
+<sys-apps/util-linux-2.12
+<sys-libs/pam-0.77
+<sys-process/procps-3.1.15
+<sys-process/psmisc-21.2-r4
+
+# optional SELinux-aware programs:
+<app-admin/logrotate-3.6.5-r1
+<gnome-base/gdm-2.4.4.7
+<sys-process/fcron-2.9.4
+<sys-fs/udev-055
+<sys-process/vixie-cron-3.0.1-r2
+
+# SELinux is integrated in 2.6
+<sys-kernel/vanilla-sources-2.6.0
+<virtual/linux-sources-2.6
+
+# Critical xattr fixes:
+<sys-boot/grub-0.94
+<sys-boot/grub-static-0.94
+
+##############################################################################
 
 # >=sci-libs/acml-3.6 requires gcc-4.2.
 >=sci-libs/acml-3.6
diff --git a/profiles/selinux/packages b/profiles/selinux/packages
index cf4bd62ab90a..e5338d3964d4 100644
--- a/profiles/selinux/packages
+++ b/profiles/selinux/packages
@@ -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/profiles/selinux/packages,v 1.25 2011/04/30 17:18:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/packages,v 1.26 2011/08/09 04:29:56 zmedico Exp $
 
 # This file extends the base packages file for the default profile that all
 # architectures will enjoy.  Please note that default is what most architectures
@@ -14,13 +14,6 @@
 ##############################################################################
 # Basic SELinux required versionings
 
-# Core Packages
->=sys-apps/portage-2.0.49-r15
->=sys-apps/baselayout-1.8.6.12-r2
->=sys-libs/glibc-2.3
->=sys-libs/uclibc-0.9.26-r8
->=sys-kernel/linux-headers-2.4.20
-
 # Base SELinux packages
 *sys-libs/libsepol
 *sys-libs/libselinux
@@ -30,26 +23,5 @@
 *sec-policy/selinux-base-policy
 
 # SELinux-aware packages
->=net-misc/openssh-3.7.1_p2
->=sys-apps/coreutils-5.0.91
->=sys-apps/findutils-4.1.20-r1
->=sys-apps/shadow-4.0.3-r7
 *>=sys-apps/util-linux-2.12
 *>=sys-libs/pam-0.77
->=sys-process/procps-3.1.15
->=sys-process/psmisc-21.2-r4
-
-# optional SELinux-aware programs:
->=app-admin/logrotate-3.6.5-r1
->=gnome-base/gdm-2.4.4.7
->=sys-process/fcron-2.9.4
->=sys-fs/udev-055
->=sys-process/vixie-cron-3.0.1-r2
-
-# SELinux is integrated in 2.6
->=sys-kernel/vanilla-sources-2.6.0
->=virtual/linux-sources-2.6
-
-# Critical xattr fixes:
->=sys-boot/grub-0.94
->=sys-boot/grub-static-0.94