more descriptive profile names

15 files changed, 144 insertions, 26 deletions

diff --git a/profiles/default/x86/1.0/make.defaults b/profiles/default/x86/gcc2/make.defaults
index 31087f354338..593bc2a9a34b 100644
--- a/profiles/default/x86/1.0/make.defaults
+++ b/profiles/default/x86/gcc2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/1.0/make.defaults,v 1.3 2004/03/18 01:11:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/gcc2/make.defaults,v 1.1 2004/03/18 01:32:13 seemant Exp $
 
 # System-wide defaults for the Portage system (1.0)
 
diff --git a/profiles/default/x86/1.0/packages b/profiles/default/x86/gcc2/packages
index 30284e281550..30284e281550 100644
--- a/profiles/default/x86/1.0/packages
+++ b/profiles/default/x86/gcc2/packages
diff --git a/profiles/default/x86/1.0/packages.build b/profiles/default/x86/gcc2/packages.build
index 66b2d7a94123..f82e949fae48 100644
--- a/profiles/default/x86/1.0/packages.build
+++ b/profiles/default/x86/gcc2/packages.build
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/1.0/packages.build,v 1.2 2004/03/18 01:11:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/gcc2/packages.build,v 1.1 2004/03/18 01:32:13 seemant Exp $
 
 # This file inherits from the parent profiles as well.  The packages listed
 # in this file enumerate those which are needed to build a stage 1 based on
diff --git a/profiles/default/x86/1.0/parent b/profiles/default/x86/gcc2/parent
index 80005b1c4369..606f47d9219b 100644
--- a/profiles/default/x86/1.0/parent
+++ b/profiles/default/x86/gcc2/parent
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/1.0/parent,v 1.1 2004/03/18 01:15:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/gcc2/parent,v 1.1 2004/03/18 01:32:13 seemant Exp $
 
 # This file describes the parent profile to this.  In most cases this will
 # just be the name of the parent directory
diff --git a/profiles/default/x86/1.0/use.defaults b/profiles/default/x86/gcc2/use.defaults
index cf836fa6b656..f3778b03dff5 100644
--- a/profiles/default/x86/1.0/use.defaults
+++ b/profiles/default/x86/gcc2/use.defaults
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/1.0/use.defaults,v 1.2 2004/03/18 01:11:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/gcc2/use.defaults,v 1.1 2004/03/18 01:32:13 seemant Exp $
 
 # Use this file to override specific mappings indicating which package
 # satisfies a particular USE flag.  The base profile (in
diff --git a/profiles/default/x86/1.0/use.mask b/profiles/default/x86/gcc2/use.mask
index fa661043f879..ee8010d55a8a 100644
--- a/profiles/default/x86/1.0/use.mask
+++ b/profiles/default/x86/gcc2/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/1.0/use.mask,v 1.1 2004/03/18 01:15:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/gcc2/use.mask,v 1.1 2004/03/18 01:32:13 seemant Exp $
 
 # This file serves as a mask file for USE flags.  This way flags that may be
 # invalid on a specific architecture or profile and not on this one will
diff --git a/profiles/default/x86/1.0/virtuals b/profiles/default/x86/gcc2/virtuals
index e0e2e1573b83..1ec74b4e2966 100644
--- a/profiles/default/x86/1.0/virtuals
+++ b/profiles/default/x86/gcc2/virtuals
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/1.0/virtuals,v 1.2 2004/03/18 01:11:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/gcc2/virtuals,v 1.1 2004/03/18 01:32:13 seemant Exp $
 
 
 # Use this virtuals file to override or add virtuals that are specific ONLY
diff --git a/profiles/default/x86/gcc31/make.defaults b/profiles/default/x86/gcc31/make.defaults
new file mode 100644
index 000000000000..d04987640bf4
--- /dev/null
+++ b/profiles/default/x86/gcc31/make.defaults
@@ -0,0 +1,18 @@
+# Copyright 2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header:
+# /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/make.defaults,v 1.3
+# 2004/03/18 00:16:43 seemant Exp $
+
+# System-wide defaults for the gcc 3 Portage system (1.0)
+
+
+USE="x86 oss 3dnow apm arts avi berkdb crypt cups encode gdbm gif gpm gtk imlib
+java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis
+opengl pam pdflib png python qt quicktime readline sdl slang spell ssl
+svga tcpd truetype X xml2 xmms xv zlib"
+
+ARCH="x86"
+COMPILER="gcc3"
+ACCEPT_KEYWORDS="x86"
+
diff --git a/profiles/default/x86/gcc31/packages b/profiles/default/x86/gcc31/packages
new file mode 100644
index 000000000000..fdeea5fb86ed
--- /dev/null
+++ b/profiles/default/x86/gcc31/packages
@@ -0,0 +1,79 @@
+# Copyright 2001-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/packages,v
+# 1.2 2004/03/18 00:16:43 seemant 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
+# *
+
+
+# Use this file to add specific packages to the `emerge system` bit of this
+# profile.  This file is also used to mask out versions, so that you can specify a
+# minimum, maximum or group of versions of packages that satisfy this specific
+# profile.   Lines which begin with a '*' add those packages to `emerge system`
+# while lines without simply act as the inclusion mask.
+
+!dev-lang/gpc
+
+*sys-libs/gdbm  
+
+~sys-devel/binutils-2.12.90.0.7
+<sys-devel/gcc-3.2_pre
+=sys-libs/glibc-2.2.5-r8
+<sys-libs/db-3.2.10
+
+>=sys-libs/pam-0.75-r9
+>=sys-devel/automake-1.6.1-r5
+
+>=sys-libs/gpm-1.19.3-r5
+>=sys-apps/isapnptools-1.23-r6
+>=sys-apps/dcron-2.7-r6
+>=sys-apps/xinetd-2.3.3-r6
+>=net-fs/samba-2.2.2-r6
+>=sys-apps/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/ucd-snmp-4.1.2-r6
+>=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
+>=net-mail/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
+
+# masking the higher ntp version
+#>=net-misc/ntp-4.1.71-r6
+<net-misc/ntp-4.1.71-r6
+>=sys-apps/apmd-3.0.1-r6
+
+#>=net-mail/postfix-20010228.5-r6
+>=net-misc/portsentry-1.1-r6
+>=sys-apps/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-apps/tcp-wrappers-7.6-r4
+
+# ickle 0.2.2 breaks with gcc3. lost history, permissions and dates.
+>=net-im/ickle-0.3.0
+>=app-sci/octave-2.1
diff --git a/profiles/default/x86/gcc31/packages.build b/profiles/default/x86/gcc31/packages.build
new file mode 100644
index 000000000000..c2e0d6fe8767
--- /dev/null
+++ b/profiles/default/x86/gcc31/packages.build
@@ -0,0 +1,7 @@
+# Copyright 2001-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/gcc31/packages.build,v 1.1 2004/03/18 01:32:13 seemant Exp $
+
+# This file describes the packages needed to build a stage 1 based on this
+# profile
+
diff --git a/profiles/default/x86/gcc31/parent b/profiles/default/x86/gcc31/parent
new file mode 100644
index 000000000000..a297e03b8ccf
--- /dev/null
+++ b/profiles/default/x86/gcc31/parent
@@ -0,0 +1,8 @@
+# Copyright 2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/gcc31/parent,v 1.1 2004/03/18 01:32:13 seemant Exp $
+
+# This file describes the parent profile to this.  In most cases this will
+# just be the name of the parent directory
+
+default
diff --git a/profiles/default/x86/gcc31/use.defaults b/profiles/default/x86/gcc31/use.defaults
new file mode 100644
index 000000000000..d16dd4ac5c08
--- /dev/null
+++ b/profiles/default/x86/gcc31/use.defaults
@@ -0,0 +1,12 @@
+# Copyright 2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/gcc31/use.defaults,v 1.1 2004/03/18 01:32:13 seemant Exp $
+
+# Use this file to override specific mappings indicating which package
+# satisfies a particular USE flag.  The base profile (in
+# ${PORTDIR}/profiles/base/use.defaults) will already describe those
+# mappings which apply to absolutely all architectures.  This file is used
+# to describe mappings which are unique to THIS SPECIFIC PROFILE ONLY.
+# Note, that these mappings extend the parent profiles' (its own parent,
+# grandparent, and so on up to the base profile).  However, mappings that
+# are present in the parents can be overridden in this file.
diff --git a/profiles/default/x86/gcc31/use.mask b/profiles/default/x86/gcc31/use.mask
new file mode 100644
index 000000000000..2e38469352b6
--- /dev/null
+++ b/profiles/default/x86/gcc31/use.mask
@@ -0,0 +1,7 @@
+# Copyright 2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/gcc31/use.mask,v 1.1 2004/03/18 01:32:13 seemant Exp $
+
+# This file serves as a mask file for USE flags.  This way flags that may be
+# invalid on a specific architecture or profile and not on this one will
+# be listed in here.
diff --git a/profiles/default/x86/gcc31/virtuals b/profiles/default/x86/gcc31/virtuals
new file mode 100644
index 000000000000..a5cd07ca6ba3
--- /dev/null
+++ b/profiles/default/x86/gcc31/virtuals
@@ -0,0 +1,7 @@
+# Copyright 2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/gcc31/virtuals,v 1.1 2004/03/18 01:32:13 seemant Exp $
+
+
+# Use this virtuals file to override or add virtuals that are specific ONLY
+# TO THIS PROFILE!
diff --git a/profiles/default/x86/make.defaults b/profiles/default/x86/make.defaults
deleted file mode 100644
index c2bba93803ae..000000000000
--- a/profiles/default/x86/make.defaults
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# System-wide defaults for the gcc 3.2 Portage system
-
-#Experimental: trying to use these USE variables to build up from stage 2->3 
-#thus eliminating the inherent fragility of using USE for this
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
-
-# Please avoid enabling things by default in here if possible. Understand any 
-# implications with core packages. For example, if "java" is in USE and db 
-# has a conditional dependency on java (which it does,) then a JDK will be 
-# pulled in during *emerge system*!
-
-USE="x86 oss apm arts avi berkdb crypt cups encode foomaticdb gdbm gif gpm gtk gtk2 imlib
-jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis
-opengl pam pdflib png python qt quicktime readline sdl slang spell ssl
-svga tcpd truetype X xml2 xmms xv zlib"
-
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"