Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and future...

diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 5e0ce13fc57f7ac9fe27e6156ff37b2ca935c215..6b1771eff82e9667692ffbc4e06f39bd9e23024b 100644 (file)
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -1,6 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.mask,v 1.22 2011/07/28 21:21:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.mask,v 1.23 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/binutils-2.13.90.0.4
+<sys-devel/gcc-3.2
+<sys-libs/glibc-2.2.5
 
 # Alexey Shvetsov <alexxy@gentoo.org> (27 Jul 2011)
 # Mask KDE SC 4.7.0 per bug #376613

diff --git a/profiles/arch/arm/packages b/profiles/arch/arm/packages
deleted file mode 100644 (file)
index 177ffcf..0000000
--- a/profiles/arch/arm/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2001-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/packages,v 1.1 2008/04/01 17:39:55 wolf31o2 Exp $
-
->=sys-devel/binutils-2.13.90.0.4
->=sys-devel/gcc-3.2
->=sys-libs/glibc-2.2.5

diff --git a/profiles/arch/ia64/package.mask b/profiles/arch/ia64/package.mask
new file mode 100644 (file)
index 0000000..9e94f60
--- /dev/null
+++ b/profiles/arch/ia64/package.mask
@@ -0,0 +1,10 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.mask,v 1.21 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/binutils-2.13.90.0.4
+<sys-devel/gcc-3.2
+<sys-libs/glibc-2.2.5

diff --git a/profiles/arch/ia64/packages b/profiles/arch/ia64/packages
deleted file mode 100644 (file)
index 39f916a..0000000
--- a/profiles/arch/ia64/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2001-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/packages,v 1.1 2008/04/01 17:39:56 wolf31o2 Exp $
-
->=sys-devel/binutils-2.13.90.0.4
->=sys-devel/gcc-3.2
->=sys-libs/glibc-2.2.5

diff --git a/profiles/arch/sh/package.mask b/profiles/arch/sh/package.mask
new file mode 100644 (file)
index 0000000..071580c
--- /dev/null
+++ b/profiles/arch/sh/package.mask
@@ -0,0 +1,10 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sh/package.mask,v 1.10 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/binutils-2.13.90.0.4
+<sys-devel/gcc-3.2
+<sys-libs/glibc-2.2.5

diff --git a/profiles/arch/sh/packages b/profiles/arch/sh/packages
deleted file mode 100644 (file)
index 2b28a92..0000000
--- a/profiles/arch/sh/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2001-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sh/packages,v 1.1 2008/04/01 17:40:02 wolf31o2 Exp $
-
->=sys-devel/binutils-2.13.90.0.4
->=sys-devel/gcc-3.2
->=sys-libs/glibc-2.2.5

diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
index f35667f3592a716913d6574d490b6ab9e1012a27..cc71708b886d5f3bcc021c336da923961b590afe 100644 (file)
--- a/profiles/arch/x86/package.mask
+++ b/profiles/arch/x86/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.mask,v 1.18 2010/10/05 23:51:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.mask,v 1.19 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/binutils-2.13.90.0.4
 
 # Christian Faulhammer <opfer@gentoo.org> (05 Dec 2006)
 # this version is badly broken on x86, see bug #153280

diff --git a/profiles/arch/x86/packages b/profiles/arch/x86/packages
deleted file mode 100644 (file)
index b70fdd1..0000000
--- a/profiles/arch/x86/packages
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2001-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/packages,v 1.1 2008/04/01 17:40:04 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 ARCHITECTURE!!
-
-# You can also add files to the base system itself if you prefix them with a
-# *
-
->=sys-devel/binutils-2.13.90.0.4

diff --git a/profiles/arch/x86/xbox/package.mask b/profiles/arch/x86/xbox/package.mask
new file mode 100644 (file)
index 0000000..d9c3a7f
--- /dev/null
+++ b/profiles/arch/x86/xbox/package.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/xbox/package.mask,v 1.1 2011/08/09 04:29:55 zmedico Exp $
+
+# version specific stuff for xbox support
+<app-misc/lirc-0.7.0_pre6
+<x11-base/xorg-x11-4.3.0-r6
+<media-sound/alsa-driver-1.0.5a
+<x11-base/xorg-6.8.0-r2

diff --git a/profiles/arch/x86/xbox/packages b/profiles/arch/x86/xbox/packages
deleted file mode 100644 (file)
index c618b89..0000000
--- a/profiles/arch/x86/xbox/packages
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2001-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/xbox/packages,v 1.1 2008/04/01 17:40:05 wolf31o2 Exp $
-
-# version specific stuff for xbox support
->=app-misc/lirc-0.7.0_pre6
->=x11-base/xorg-x11-4.3.0-r6
->=media-sound/alsa-driver-1.0.5a
->=x11-base/xorg-6.8.0-r2

diff --git a/profiles/features/gcc2/package.mask b/profiles/features/gcc2/package.mask
index 0fbb119ea2f8c66647c1ca27c4d74b8cf6c4ecf7..fe55954145a9c3964fc8fa94f579028c37f44c71 100644 (file)
--- 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 (file)
index e814633..0000000
--- 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 6ccd19ec70ceba5130ad04295e297d2e0d038f3e..43d0bedb3cae9ec31a492f4d6ae2a978a1ac3b13 100644 (file)
--- 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 72b3ac7141ef5303a35fdc2287003bb89b75bb97..a566ba595039e36559c1dce27d31e6b0e09c6e84 100644 (file)
--- 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

diff --git a/profiles/hardened/amd64/package.mask b/profiles/hardened/amd64/package.mask
index bcff19b5fc42d1e72d66cf693a3b003f6e2c8bad..72152004344c89604dc33271b8d54a135684c496 100644 (file)
--- a/profiles/hardened/amd64/package.mask
+++ b/profiles/hardened/amd64/package.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/package.mask,v 1.5 2009/07/31 11:00:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/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/binutils-2.13.90.0.4
+<x11-base/xorg-x11-6.8.0-r4
 
 # Andrew Ross <aross@gentoo.org>
 # grub needs a multilib profile to compile on amd64 - use sys-boot/grub-static

diff --git a/profiles/hardened/amd64/packages b/profiles/hardened/amd64/packages
index 95abedbf47fce7eb36798286baa1c3c59caeeb05..8e349d27bd7d54256532bacc71c656837b03d2f3 100644 (file)
--- a/profiles/hardened/amd64/packages
+++ b/profiles/hardened/amd64/packages
@@ -1,6 +1,4 @@
 *>=sys-devel/binutils-2.13.90.0.4
 
->=x11-base/xorg-x11-6.8.0-r4
-
 *sys-devel/libtool
 *virtual/dev-manager 

diff --git a/profiles/hardened/ia64/package.mask b/profiles/hardened/ia64/package.mask
index 6281fd1f20e66c3f28236f76453b071ca9101e89..d5ec283aa03772410738e6b3a975ce1932c4f047 100644 (file)
--- a/profiles/hardened/ia64/package.mask
+++ b/profiles/hardened/ia64/package.mask
@@ -1,5 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ia64/package.mask,v 1.2 2009/07/31 11:11:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ia64/package.mask,v 1.3 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/binutils-2.13.90.0.4
+<x11-base/xorg-x11-6.8.0-r4
 
 <sys-kernel/linux-headers-2.5

diff --git a/profiles/hardened/ia64/packages b/profiles/hardened/ia64/packages
index a99a222d5036301ad01ef2a74c88c8863bb2e7c7..0e1923baafc842c079edf5458cc99ff83c7e5a19 100644 (file)
--- a/profiles/hardened/ia64/packages
+++ b/profiles/hardened/ia64/packages
@@ -1,10 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ia64/packages,v 1.3 2009/07/14 08:39:01 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ia64/packages,v 1.4 2011/08/09 04:29:55 zmedico Exp $
 
 *>=sys-devel/binutils-2.13.90.0.4
 
->=x11-base/xorg-x11-6.8.0-r4
-
 *sys-devel/libtool
 *virtual/dev-manager

diff --git a/profiles/hardened/x86/package.mask b/profiles/hardened/x86/package.mask
index 5944c938ccff840b1df69ec00cdff5cd283c4759..fe23e2e42b123bbfb8a98a45e4886399398c666c 100644 (file)
--- a/profiles/hardened/x86/package.mask
+++ b/profiles/hardened/x86/package.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/package.mask,v 1.54 2009/09/11 17:48:07 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/package.mask,v 1.55 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.
+<sys-devel/binutils-2.13.90.0.4
+<x11-base/xorg-x11-6.8.0-r4
 
 <sys-kernel/linux-headers-2.5
 

diff --git a/profiles/hardened/x86/packages b/profiles/hardened/x86/packages
index c3d77e4ec819ae2bb599675a31a141f818ab6ccf..46bb3adf8b0a0c8b1faf96770fbeedebef4c6d00 100644 (file)
--- a/profiles/hardened/x86/packages
+++ b/profiles/hardened/x86/packages
@@ -1,10 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/packages,v 1.16 2009/07/14 08:39:00 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/packages,v 1.17 2011/08/09 04:29:56 zmedico Exp $
 
 *>=sys-devel/binutils-2.13.90.0.4
 
->=x11-base/xorg-x11-6.8.0-r4
-
 *sys-devel/libtool
 *virtual/dev-manager

diff --git a/profiles/releases/10.0/package.mask b/profiles/releases/10.0/package.mask
index fc4a2957ac469e4baa70839f0cb510eeb4f82b33..8c6d52a6156d05ec9d96a2603745551961d6f427 100644 (file)
--- a/profiles/releases/10.0/package.mask
+++ b/profiles/releases/10.0/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/10.0/package.mask,v 1.1 2011/08/09 03:02:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/10.0/package.mask,v 1.2 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.
+<sys-apps/baselayout-1.12.10-r5
+<sys-apps/portage-2.1.6.8
 <sys-devel/binutils-2.18-r1
 <sys-libs/glibc-2.4-r4

diff --git a/profiles/releases/10.0/packages b/profiles/releases/10.0/packages
deleted file mode 100644 (file)
index 63f0ddc..0000000
--- a/profiles/releases/10.0/packages
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/10.0/packages,v 1.3 2011/08/09 03:02:23 zmedico 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-apps/baselayout-1.12.10-r5
->=sys-apps/portage-2.1.6.8

diff --git a/profiles/releases/2008.0/package.mask b/profiles/releases/2008.0/package.mask
index b23e6bf16cf36919a6488f77cf60716600166ac2..d5074ca957821b3ece16666ec34bfb9d9656052f 100644 (file)
--- a/profiles/releases/2008.0/package.mask
+++ b/profiles/releases/2008.0/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/2008.0/package.mask,v 1.5 2011/08/09 03:02:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/2008.0/package.mask,v 1.6 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.
+<sys-apps/baselayout-1.12.10-r5
+<sys-apps/portage-2.1.4.4
 <sys-devel/binutils-2.18-r1
 <sys-libs/glibc-2.4-r4

diff --git a/profiles/releases/2008.0/packages b/profiles/releases/2008.0/packages
deleted file mode 100644 (file)
index 2463f3e..0000000
--- a/profiles/releases/2008.0/packages
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/2008.0/packages,v 1.2 2011/08/09 03:02:23 zmedico 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-apps/baselayout-1.12.10-r5
->=sys-apps/portage-2.1.4.4

diff --git a/profiles/selinux/package.mask b/profiles/selinux/package.mask
index 50bb1ae0e94ef0f9639fe87e8d4006f85f9b5e7b..f10697fe38e2b4e20fa84ca8a8e091d51d1fd17b 100644 (file)
--- 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 cf4bd62ab90a4faf32caa9934f397df2920107c2..e5338d3964d4ce313f42912052c2421a82c842b3 100644 (file)
--- 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