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

4 files changed, 92 insertions, 86 deletions

diff --git a/profiles/features/gcc2/package.mask b/profiles/features/gcc2/package.mask
index 0fbb119ea2f8..fe55954145a9 100644
--- a/profiles/features/gcc2/package.mask
+++ b/profiles/features/gcc2/package.mask
@@ -1,6 +1,56 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/gcc2/package.mask,v 1.5 2010/04/08 13:55:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/gcc2/package.mask,v 1.6 2011/08/09 04:29:55 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.
+<sys-devel/gcc-2.95.3
+>sys-devel/gcc-2.95.3-r9999
+<sys-libs/glibc-2.2.5
+>sys-libs/glibc-2.2.5-r9999
+
+<sci-mathematics/octave-2.0
+>sci-mathematics/octave-2.0.9999
+
+<sys-apps/texinfo-4.2-r1
+
+#these ones have the new rc6 style init scripts
+<sys-libs/gpm-1.19.3-r5
+<sys-apps/isapnptools-1.23-r6
+
+<sys-apps/xinetd-2.3.3-r6
+<net-fs/samba-2.2.2-r6
+<sys-process/at-3.1.8-r6
+<app-admin/fcron-1.1.1-r6
+<app-admin/metalog-0.6-r6
+<app-admin/mon-0.38.20-r6
+<app-admin/syslog-ng-1.4.12-r6
+<net-www/apache-1.3.20-r6
+<net-analyzer/net-snmp-5.1.1
+<net-ftp/oftpd-0.3.6-r6
+<net-ftp/proftpd-1.2.4-r6
+<net-misc/dhcp-3.0_rc12-r6
+<net-misc/bind-9.1.3-r6
+<net-misc/netkit-timed-0.17-r6
+<net-misc/pdnsd-1.1.6-r6
+<mail-mta/exim-3.32-r6
+<net-misc/fakeidentd-1.4-r6
+<net-nds/openldap-1.2.12-r6
+<net-nds/portmap-5b-r6
+<media-sound/alsa-utils-0.5.10-r6
+<net-print/LPRng-3.7.9-r6
+<net-nds/ypbind-1.7-r6
+<net-nds/ypserv-1.3.9-r6
+<net-print/cups-1.1.10-r6
+<sys-apps/apmd-3.0.1-r6
+<net-misc/portsentry-1.1-r6
+<sys-block/noflushd-2.4-r6
+<app-text/dictd-1.5.5-r6
+<net-fs/samba-winbind-20010329-r6
+<net-www/wwwoffle-2.6d-r6
+<net-www/squid-2.4.2s-r6
+<net-dialup/ppp-2.4.1-r6
 
 >=sys-kernel/linux-headers-2.5
 >=sys-devel/gcc-2.95.4
diff --git a/profiles/features/gcc2/packages b/profiles/features/gcc2/packages
deleted file mode 100644
index e814633d7ff9..000000000000
--- a/profiles/features/gcc2/packages
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2001-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/gcc2/packages,v 1.1 2008/04/01 17:41:08 wolf31o2 Exp $
-
-# For instructions on how this file works (as an inclusion mask, primarily),
-# please refer to ${PORTDIR}/profiles/base/packages
-
-# Use this file to lock down specific versions of packages ONLY TO THIS
-# SPECIFIC PROFILE!
-
-# You can also add files to the base system itself if you prefix them with a
-# *
-
-~sys-devel/gcc-2.95.3
-~sys-libs/glibc-2.2.5
-
->=sys-apps/texinfo-4.2-r1
-
-#these ones have the new rc6 style init scripts
->=sys-libs/gpm-1.19.3-r5
->=sys-apps/isapnptools-1.23-r6
-
->=sys-apps/xinetd-2.3.3-r6
->=net-fs/samba-2.2.2-r6
->=sys-process/at-3.1.8-r6
->=app-admin/fcron-1.1.1-r6
->=app-admin/metalog-0.6-r6
->=app-admin/mon-0.38.20-r6
->=app-admin/syslog-ng-1.4.12-r6
->=net-www/apache-1.3.20-r6
->=net-analyzer/net-snmp-5.1.1
->=net-ftp/oftpd-0.3.6-r6
->=net-ftp/proftpd-1.2.4-r6
->=net-misc/dhcp-3.0_rc12-r6
->=net-misc/bind-9.1.3-r6
->=net-misc/netkit-timed-0.17-r6
->=net-misc/pdnsd-1.1.6-r6
->=mail-mta/exim-3.32-r6
->=net-misc/fakeidentd-1.4-r6
->=net-nds/openldap-1.2.12-r6
->=net-nds/portmap-5b-r6
->=media-sound/alsa-utils-0.5.10-r6
->=net-print/LPRng-3.7.9-r6
->=net-nds/ypbind-1.7-r6
->=net-nds/ypserv-1.3.9-r6
->=net-print/cups-1.1.10-r6
->=sys-apps/apmd-3.0.1-r6
->=net-misc/portsentry-1.1-r6
->=sys-block/noflushd-2.4-r6
->=app-text/dictd-1.5.5-r6
->=net-fs/samba-winbind-20010329-r6
->=net-www/wwwoffle-2.6d-r6
->=net-www/squid-2.4.2s-r6
->=net-dialup/ppp-2.4.1-r6
-=sci-mathematics/octave-2.0*
-
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 6ccd19ec70ce..43d0bedb3cae 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -1,4 +1,43 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.8 2011/08/07 11:07:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.9 2011/08/09 04:29:55 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
+
+# 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/features/selinux/packages b/profiles/features/selinux/packages
index 72b3ac7141ef..a566ba595039 100644
--- a/profiles/features/selinux/packages
+++ b/profiles/features/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/features/selinux/packages,v 1.1 2011/05/17 10:46:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/packages,v 1.2 2011/08/09 04:29:55 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,25 +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
-
-# Critical xattr fixes:
->=sys-boot/grub-0.94
->=sys-boot/grub-static-0.94