Push hardened/x86/2.6 down to hardened/x86

6 files changed, 38 insertions, 201 deletions

diff --git a/profiles/hardened/x86/2.6/parent b/profiles/hardened/x86/2.6/parent
index aab0408ceca6..f3229c5b9876 100644
--- a/profiles/hardened/x86/2.6/parent
+++ b/profiles/hardened/x86/2.6/parent
@@ -1 +1 @@
-../..
+..
diff --git a/profiles/hardened/x86/make.defaults b/profiles/hardened/x86/make.defaults
index 1005d86c2a95..9de9db61c824 100644
--- a/profiles/hardened/x86/make.defaults
+++ b/profiles/hardened/x86/make.defaults
@@ -1,12 +1,25 @@
-# Copyright 1999-2004 Gentoo Foundation.
+# Copyright 1999-2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/make.defaults,v 1.15 2007/02/20 22:43:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/make.defaults,v 1.16 2009/03/24 17:26:37 gengor Exp $
 
 ARCH="x86"
-ACCEPT_KEYWORDS="${ARCH}"
-USE="${ARCH} berkdb crypt hardened ncurses nls pam pic readline ssl tcpd zlib"
+ACCEPT_KEYWORDS="x86"
 
-# x86
-CHOST="i386-pc-linux-gnu"
-CFLAGS="-O2 -mcpu=i386 -pipe -fforce-addr"
+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/package.mask b/profiles/hardened/x86/package.mask
index 46484421b140..6d3c46879eae 100644
--- a/profiles/hardened/x86/package.mask
+++ b/profiles/hardened/x86/package.mask
@@ -1,148 +1,5 @@
-# Copyright 2006 Gentoo Foundation
+# Copyright 1999-2006 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.51 2009/01/11 07:36:55 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/package.mask,v 1.52 2009/03/24 17:26:37 gengor Exp $
 
-# Chris Gianelloni <wolf31o2@gentoo.org> (20 Sep 2007)
-# mask because it requires nptl and 2.6
->=sys-libs/glibc-2.6
-
-# Markus Ullmann <jokey@gentoo.org> (18 Apr 2007)
-# mask because of b0rkage with hardened compiler, works with vanilla compiler
-# see bug #174813
-app-emulation/virtualbox-ose
-
-# Christian Faulhammer <opfer@gentoo.org> (04 Mar 2007)
-# does not work with kernel 2.4, see bug #158271
->=sys-apps/iproute2-2.6.19.20061214
-# depends on above iproute2 versions
-net-misc/vpnc
-
-# Christian Faulhammer <opfer@gentoo.org> (05 Dec 2006)
-# this version is badly broken on x86, see bug #153280
-~app-arch/rpm-4.4.7
-
-x11-drivers/linuxwacom
-app-cdr/bonfire
-app-cdr/brasero
-dev-util/rootstrap
-media-plugins/gst-plugins-v4l2
-net-firewall/ipsec-tools
-net-misc/lksctp-tools
-net-misc/mrouted
-sys-apps/hal
-sys-apps/hwinfo
-sys-apps/ivman
-sys-apps/raidutils
-sys-power/kpowersave
-sys-power/powersave
-media-libs/libipoddevice
-dev-dotnet/ipod-sharp
-app-pda/dopi
-media-sound/banshee
-media-plugins/banshee-official-plugins
-media-video/thoggen
-gnome-base/gnome-mount
-gnome-base/gnome-volume-manager
-gnome-extra/hal-device-manager
-gnome-extra/gnome-power-manager
-app-crypt/luks-tools
-sys-apps/pmount
-sys-apps/keyutils
-sys-auth/pam_usb
-sys-auth/pam_keyring
-dev-embedded/ponyprog
-app-editors/screem
-app-editors/peacock
-app-editors/mlview
-app-editors/ghex
-app-editors/conglomerate
-app-pda/gnome-pilot
-
-# Requires 2.6 kernel headers
-sys-apps/inputd
-x11-drivers/xf86-input-evdev
->=app-misc/lcdproc-0.5.0
->=sys-process/audit-1.2.9
-
-# Christian Faulhammer <opfer@gentoo.ort>
-# requires >=gnome-base/libgnome-2.16.0
->=net-irc/xchat-gnome-0.15
-
-# Mart Raudsepp <leio@gentoo.org>
-# GNOME-2.16 is not supported on 2.4 kernels, as per bug #147707
->=gnome-base/gnome-2.16.0
->=gnome-extra/gnome2-user-docs-2.16.0
->=app-admin/pessulus-2.16.0
->=app-admin/sabayon-2.12.4
->=gnome-base/gnome-vfs-2.16.0
->=gnome-base/gnome-vfs-monikers-2.15.3
->=gnome-base/libbonobo-2.16.0
->=gnome-base/libbonoboui-2.16.0
->=gnome-base/libgnome-2.16.0
->=x11-libs/pango-1.14.3
->=x11-misc/alacarte-0.10.0
->=gnome-extra/bug-buddy-2.16.0
->=gnome-base/gnome-control-center-2.16.0
->=app-accessibility/dasher-4.2.0
->=gnome-extra/deskbar-applet-2.16.0
->=gnome-base/eel-2.16.0
->=media-gfx/eog-2.16.0.1
->=www-client/epiphany-2.16.0
->=mail-client/evolution-2.8.0
->=gnome-extra/evolution-data-server-1.8.0
->=gnome-extra/evolution-exchange-2.8.0
->=gnome-extra/evolution-webcal-2.8.0
->=gnome-extra/fast-user-switch-applet-2.16.0
->=app-arch/file-roller-2.16.0
->=gnome-extra/gcalctool-5.8.24
->=gnome-extra/gconf-editor-2.16.0
->=gnome-base/gdm-2.16.0
->=app-editors/gedit-2.16.0
->=gnome-base/gnome-applets-2.16.0.1
->=x11-themes/gnome-backgrounds-2.15.92
->=gnome-base/gnome-desktop-2.16.0
->=app-text/gnome-doc-utils-0.8.0
->=gnome-extra/gnome-games-2.15.92
->=x11-themes/gnome-icon-theme-2.16.0.1
->=gnome-base/gnome-keyring-0.6.0
->=gnome-extra/gnome-keyring-manager-2.16.0
->=app-accessibility/gnome-mag-0.13.1
->=gnome-extra/gnome-media-2.16.1
->=gnome-base/gnome-menus-2.16.0
->=net-analyzer/gnome-nettool-2.15.92
->=gnome-base/gnome-panel-2.16.0
->=gnome-extra/gnome-power-manager-2.16.0
->=dev-python/gnome-python-desktop-2.16.0
->=gnome-extra/gnome-screensaver-2.16.0
->=gnome-base/gnome-session-2.16.0
->=gnome-extra/gnome-system-monitor-2.15.92
->=x11-terms/gnome-terminal-2.16.0
->=x11-themes/gnome-themes-2.16.0
->=gnome-extra/gnome-utils-2.16.0
->=gnome-base/gnome-volume-manager-2.15.0
->=app-accessibility/gok-1.2.0
->=x11-themes/gtk-engines-2.8.0
->=gnome-extra/gtkhtml-3.12.0
->=x11-libs/gtksourceview-1.8.0
->=gnome-extra/gucharmap-1.8.0
->=gnome-base/librsvg-2.17.0
->=net-libs/libsoup-2.2.96
->=x11-libs/libwnck-2.16.0
->=x11-wm/metacity-2.16.0
->=gnome-base/nautilus-2.16.0
->=gnome-extra/nautilus-cd-burner-2.16.0
->=media-sound/sound-juicer-2.16.0
->=media-video/totem-2.16.0
->=x11-libs/vte-0.16.0
->=gnome-extra/yelp-2.16.0
->=gnome-extra/zenity-2.16.0
->=dev-python/gnome-python-2.16.0
->=dev-python/pygobject-2.12.1
->=dev-python/pygtk-2.10.1
->=x11-libs/libxklavier-3.0
->=www-client/epiphany-extensions-2.16.0
->=gnome-base/gconf-2.16.0
->=gnome-base/gnome-light-2.16.0
->=app-accessibility/orca-1
-x11-wm/compiz
->=dev-dotnet/evolution-sharp-0.12.0
+<sys-kernel/linux-headers-2.5
diff --git a/profiles/hardened/x86/packages b/profiles/hardened/x86/packages
index a7669a8ae48c..bcf9ee902fdb 100644
--- a/profiles/hardened/x86/packages
+++ b/profiles/hardened/x86/packages
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation.
+# Copyright 1999-2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/packages,v 1.14 2008/12/29 20:19:32 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/packages,v 1.15 2009/03/24 17:26:37 gengor Exp $
 
 # IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
 
@@ -11,17 +11,4 @@
 *sys-devel/libtool
 *virtual/dev-manager
 
-# masking 2.6 kernels/headers
-<sys-kernel/linux-headers-2.5
-<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/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/pcmcia-2.5
diff --git a/profiles/hardened/x86/use.mask b/profiles/hardened/x86/use.mask
index 9cb47d977b7e..cdc9abd95e96 100644
--- a/profiles/hardened/x86/use.mask
+++ b/profiles/hardened/x86/use.mask
@@ -1,45 +1,33 @@
-# Copyright 1999-2007 Gentoo Foundation.
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/use.mask,v 1.31 2009/01/11 07:36:55 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/use.mask,v 1.32 2009/03/24 17:26:37 gengor Exp $
 
 -3dnow
 -3dnowext
+-kqemu
 -mmx
 -mmxext
+-nvram
 -sse
 -sse2
--win32codecs
--kqemu
+-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
-input_devices_evdev
 video_cards_newport
 
-nptl
-nptlonly
-hal
-v4l2
-ipod
-uml
-
-# Chris Gianelloni <wolf31o2@gentoo.org> (22 Jun 2006)
-# Masking for bug #136866
-pmount
-
-# Christian Faulhammer <opfer@gentoo.org> (23 Nov 2006)
-# only available for ppc64, see bug #156000
-ibm
-
-#input_devices_wacom
+# codec support
+-win32codecs
 -x264
 
-# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
+# Diego Petteno <flameeyes@gentoo.org> (4 Jan 2007)
 # Unmask the flags for PHP that are available only on x86
 -fdftk
 -sybase-ct
@@ -61,9 +49,3 @@ ibm
 -oracle7
 -firebird
 -db2
-
-# dev-lang/tcc won't build
--tcc
-
-# mask evo since gnome won't work on 2.4 anymore
-evo
diff --git a/profiles/hardened/x86/virtuals b/profiles/hardened/x86/virtuals
index 1bfeb8107d3a..a9794db7d5ed 100644
--- a/profiles/hardened/x86/virtuals
+++ b/profiles/hardened/x86/virtuals
@@ -1,6 +1,4 @@
-# Copyright 1999-2004 Gentoo Foundation.
+# Copyright 1999-2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/virtuals,v 1.12 2007/12/26 21:35:45 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/virtuals,v 1.13 2009/03/24 17:26:37 gengor Exp $
 
-virtual/alsa			media-sound/alsa-driver
-virtual/dev-manager		sys-fs/devfsd