Move masking to package.mask and remove redundant entries from packages.

4 files changed, 34 insertions, 35 deletions

diff --git a/profiles/default-linux/x86/ChangeLog b/profiles/default-linux/x86/ChangeLog
index afbb3ecc0297..00885e537210 100644
--- a/profiles/default-linux/x86/ChangeLog
+++ b/profiles/default-linux/x86/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.24 2006/09/29 20:40:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.25 2006/10/02 19:46:24 wolf31o2 Exp $
+
+  02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  no-nptl/2.4/package.mask, -no-nptl/2.4/packages, -no-nptl/packages:
+  Move masking to package.mask and remove redundant entries from packages.
 
   29 Sep 2006; Stephen Bennett <spb@gentoo.org> no-nptl/2.4/package.mask:
   Masking >=sys-kernel/linux-headers since packages requires 2.4
diff --git a/profiles/default-linux/x86/no-nptl/2.4/package.mask b/profiles/default-linux/x86/no-nptl/2.4/package.mask
index 14f523a80a5b..cc08db585cd3 100644
--- a/profiles/default-linux/x86/no-nptl/2.4/package.mask
+++ b/profiles/default-linux/x86/no-nptl/2.4/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/no-nptl/2.4/package.mask,v 1.24 2006/09/29 15:43:03 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/no-nptl/2.4/package.mask,v 1.25 2006/10/02 19:46:24 wolf31o2 Exp $
 
 # Andrej Kacian <ticho@gentoo.org>
 # Depends on >=2.6.11 headers
@@ -142,6 +142,32 @@ x11-drivers/xf86-input-evdev
 >=www-client/epiphany-extensions-2.16.0
 >=x11-misc/icon-naming-utils-0.8.1
 
-# Stephen Bennett <spb@gentoo.org>
-# Mask 2.[56] linux-headers for fairly obvious reasons
+# Chris Gianelloni <wolf31o2@gentoo.org>
+# Since this is a 2.4-only profile, we cannot have any 2.6-based headers/kernels
+>=sys-kernel/ck-sources-2.5
+>=sys-kernel/gentoo-sources-2.5
+>=sys-kernel/git-sources-2.5
+>=sys-kernel/hardened-sources-2.5
+>=sys-kernel/hppa-sources-2.5
 >=sys-kernel/linux-headers-2.5
+>=sys-kernel/mips-headers-2.5
+>=sys-kernel/mips-sources-2.5
+>=sys-kernel/mm-sources-2.5
+>=sys-kernel/openblocks-sources-2.5
+>=sys-kernel/openmosix-sources-2.5
+>=sys-kernel/openvz-sources-2.5
+>=sys-kernel/rsbac-sources-2.5
+>=sys-kernel/sh-sources-2.5
+>=sys-kernel/sparc-sources-2.5
+>=sys-kernel/suspend2-sources-2.5
+>=sys-kernel/systrace-sources-2.5
+>=sys-kernel/usermode-sources-2.5
+>=sys-kernel/vanilla-sources-2.5
+>=sys-kernel/vserver-sources-2.5
+>=sys-kernel/xbox-sources-2.5
+>=sys-kernel/xen-sources-2.5
+>=virtual/linux-sources-2.5
+
+# Chris Gianelloni <wolf31o2@gentoo.org>
+# We also don't allow virtual/pcmcia greater than 2.4.*
+>=virtual/pcmcia-2.5
diff --git a/profiles/default-linux/x86/no-nptl/2.4/packages b/profiles/default-linux/x86/no-nptl/2.4/packages
deleted file mode 100644
index 4481ada71dae..000000000000
--- a/profiles/default-linux/x86/no-nptl/2.4/packages
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2001-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/no-nptl/2.4/packages,v 1.3 2006/04/02 00:26:01 johnm 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-kernel/ac-sources-2.5
-<sys-kernel/ck-sources-2.5
-<sys-kernel/gentoo-sources-2.5
-<sys-kernel/grsec-sources-2.5
-<sys-kernel/hardened-sources-2.5
-<sys-kernel/openmosix-sources-2.5
-<sys-kernel/rsbac-sources-2.5
-<sys-kernel/uclinux-sources-2.5
-<sys-kernel/usermode-sources-2.5
-<sys-kernel/vanilla-sources-2.5
-<sys-kernel/win4lin-sources-2.5
-<sys-kernel/xbox-sources-2.5
-<virtual/linux-sources-2.5
-
-<sys-kernel/linux-headers-2.5
-
-<virtual/pcmcia-2.5
diff --git a/profiles/default-linux/x86/no-nptl/packages b/profiles/default-linux/x86/no-nptl/packages
deleted file mode 100644
index db629c709f97..000000000000
--- a/profiles/default-linux/x86/no-nptl/packages
+++ /dev/null
@@ -1 +0,0 @@
-<sys-libs/glibc-2.4