Push hardened/x86/2.6 down to hardened/x86 take three

12 files changed, 0 insertions, 151 deletions

diff --git a/profiles/hardened/x86/2.6/README b/profiles/hardened/x86/2.6/README
deleted file mode 100644
index ae831e2ca8e2..000000000000
--- a/profiles/hardened/x86/2.6/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This is a hardened profile for 2.6-series kernels on x86.  Note that it inherits from
-hardened, not hardened/x86.  hardened/x86 is for 2.4-series kernel only and masks stuff
-that is only appropriate for 2.6 kernels.  To avoid unnecessary disruption to the 2.4
-profile, and to avoid this 2.6 profile having to undo masks in the 2.4 profile, this
-profile simply inherits from the base hardened profile (parent = ../..).
-
-Kevin F. Quinn <kevquinn@gentoo.org>, 25th June 2006
diff --git a/profiles/hardened/x86/2.6/make.defaults b/profiles/hardened/x86/2.6/make.defaults
deleted file mode 100644
index 0b679e63852c..000000000000
--- a/profiles/hardened/x86/2.6/make.defaults
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/make.defaults,v 1.15 2008/10/22 14:49:33 remi Exp $
-
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-
-CHOST="i486-pc-linux-gnu"
-CFLAGS="-O2 -mcpu=i486 -pipe -fforce-addr"
-CXXFLAGS="${CFLAGS}"
-
-USE="berkdb crypt hardened nls nptl nptlonly pam pic readline ssl tcpd zlib"
-
-# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
-# Defaults for video drivers
-VIDEO_CARDS="apm ark chips cirrus cyrix dummy fbdev glint i128 i740 i810 imstt intel \
-	mach64 mga neomagic nsc nv r128 radeon rendition s3 s3virge savage \
-	siliconmotion sis sisusb tdfx tga trident tseng v4l vesa vga via vmware \
-	voodoo"
-
-# 2006/12/21 - Andrej Kacian <ticho@gentoo.org>
-# Defaults for audio drivers
-ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 \
-	emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m \
-	maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
diff --git a/profiles/hardened/x86/2.6/minimal/make.defaults b/profiles/hardened/x86/2.6/minimal/make.defaults
deleted file mode 100644
index 984133854278..000000000000
--- a/profiles/hardened/x86/2.6/minimal/make.defaults
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2007 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/minimal/make.defaults,v 1.3 2007/05/24 04:40:53 solar Exp $
-
-# - TESTING PROFILE - TESTING PROFILE - 
-#  ------ USE AT YOUR OWN RISK ------
-
-ARCH="x86"
-ACCEPT_KEYWORDS="${ARCH}"
-USE="-* ${ARCH} crypt hardened minimal multicall ncurses pic readline zlib"
-PORTDIR=/usr/portage/
-PKGDIR=${PORTDIR}/packages/${ARCH}/
-
-CFLAGS="-Os -pipe"
-CXXFLAGS="${CFLAGS}"
-FEATURES="sandbox sfperms strict nodoc noinfo noman autoconfig"
-
diff --git a/profiles/hardened/x86/2.6/minimal/parent b/profiles/hardened/x86/2.6/minimal/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/hardened/x86/2.6/minimal/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/x86/2.6/minimal/use.mask b/profiles/hardened/x86/2.6/minimal/use.mask
deleted file mode 100644
index 6645969ef058..000000000000
--- a/profiles/hardened/x86/2.6/minimal/use.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-pam
-nls
diff --git a/profiles/hardened/x86/2.6/minimal/virtuals b/profiles/hardened/x86/2.6/minimal/virtuals
deleted file mode 100644
index 590fb8492d5a..000000000000
--- a/profiles/hardened/x86/2.6/minimal/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/ssh	net-misc/dropbear
diff --git a/profiles/hardened/x86/2.6/package.mask b/profiles/hardened/x86/2.6/package.mask
deleted file mode 100644
index 92d569969a52..000000000000
--- a/profiles/hardened/x86/2.6/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/package.mask,v 1.13 2007/09/21 03:08:47 wolf31o2 Exp $
-
-<sys-kernel/linux-headers-2.5
diff --git a/profiles/hardened/x86/2.6/package.use b/profiles/hardened/x86/2.6/package.use
deleted file mode 100644
index 9a3642cd84e2..000000000000
--- a/profiles/hardened/x86/2.6/package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file requires >=portage-2.1.2 (see bug #61732)
-
-# cyrus-sasl doesn't work w/ USE=berkdb (#192753)
-dev-libs/cyrus-sasl gdbm
diff --git a/profiles/hardened/x86/2.6/package.use.mask b/profiles/hardened/x86/2.6/package.use.mask
deleted file mode 100644
index 6f3fa56ea388..000000000000
--- a/profiles/hardened/x86/2.6/package.use.mask
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file requires >=portage-2.1.1
-
-# Raúl Porcel <armin76@gentoo.org> (02 Dec 2008)
-media-libs/realcodecs win32codecs
-
-# Jean-Noël Rivasseau <elvanor@gentoo.org> (01 Aug 2008)
-# Disabling gcj flag, no gcc-4.3.1 yet
-dev-java/eclipse-ecj gcj
-
-# cyrus-sasl doesn't work w/ USE=berkdb (#192753)
-dev-libs/cyrus-sasl berkdb
-
-# bug #147908 - unmask these on x86 profiles
-dev-java/sun-jdk -nsplugin
-dev-java/sun-jre-bin -nsplugin
-dev-java/ibm-jdk-bin -nsplugin 
-dev-java/ibm-jre-bin -nsplugin
-
-# missing the necessary linux-headers dep
->=net-fs/netatalk-2.0.3-r3 xfs
diff --git a/profiles/hardened/x86/2.6/packages b/profiles/hardened/x86/2.6/packages
deleted file mode 100644
index b2605c2d9070..000000000000
--- a/profiles/hardened/x86/2.6/packages
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/packages,v 1.5 2007/06/28 10:07:37 vapier Exp $
-
-# IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
-
-*>=sys-devel/binutils-2.13.90.0.4
-
->=x11-base/xorg-x11-6.8.0-r4
-
-*sys-devel/libtool
-*virtual/dev-manager
-
-<virtual/pcmcia-2.5
diff --git a/profiles/hardened/x86/2.6/use.mask b/profiles/hardened/x86/2.6/use.mask
deleted file mode 100644
index 75507fba972f..000000000000
--- a/profiles/hardened/x86/2.6/use.mask
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/use.mask,v 1.19 2008/11/06 00:07:10 zmedico Exp $
-
--3dnow
--3dnowext
--kqemu
--mmx
--mmxext
--nvram
--sse
--sse2
--svga
-
-# Copied from default-linux/x86 2006-04-02; bug #128490
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-# codec support
--win32codecs
--x264
-
-# Diego Petteno <flameeyes@gentoo.org> (4 Jan 2007)
-# Unmask the flags for PHP that are available only on x86
--fdftk
--sybase-ct
--ingres
--birdstep
--adabas
--filepro
--pfpro
--informix
--empress
--empress-bcs
--sybase
--frontbase
--dbmaker
--esoob
--solid
-# Shared with amd64
--oci8
--oracle7
--firebird
--db2
diff --git a/profiles/hardened/x86/2.6/virtuals b/profiles/hardened/x86/2.6/virtuals
deleted file mode 100644
index d38097b33c98..000000000000
--- a/profiles/hardened/x86/2.6/virtuals
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/virtuals,v 1.7 2006/06/25 21:23:48 kevquinn Exp $
-