From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Fri, 13 Apr 2007 22:11:18 +0000 (+0000)
Subject: Adding the 2007.0 profile from the release snapshot.  This will allow us to do final... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4bb1e3216f911c94dbbce2ef336c3a2d68b1b21;p=gentoo.git

Adding the 2007.0 profile from the release snapshot.  This will allow us to do final testing/QA on the release media before it hits the mirrors.  This profile is designed to work with the release media, so beware if you're using it yourself without knowing the implications of what it will affect for you.
---

diff --git a/profiles/default-linux/amd64/2007.0/desktop/make.defaults b/profiles/default-linux/amd64/2007.0/desktop/make.defaults
new file mode 100644
index 000000000000..f89280f23681
--- /dev/null
+++ b/profiles/default-linux/amd64/2007.0/desktop/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/desktop/make.defaults,v 1.3 2007/04/13 22:11:18 wolf31o2 Exp $
+
+USE="acpi alsa arts cairo cdr dbus dvd dvdr dvdread eds emboss encode esd evo fam firefox gif gnome gpm gstreamer gtk hal jpeg kde kerberos ldap mad mikmod mp3 mpeg ogg opengl oss pdf png qt3 qt3support qt4 quicktime sdl spell svg tiff truetype vorbis win32codecs unicode X xml xv"
diff --git a/profiles/default-linux/amd64/dev/2007.0/desktop/parent b/profiles/default-linux/amd64/2007.0/desktop/parent
similarity index 100%
rename from profiles/default-linux/amd64/dev/2007.0/desktop/parent
rename to profiles/default-linux/amd64/2007.0/desktop/parent
diff --git a/profiles/default-linux/amd64/dev/2007.0/desktop/virtuals b/profiles/default-linux/amd64/2007.0/desktop/virtuals
similarity index 75%
rename from profiles/default-linux/amd64/dev/2007.0/desktop/virtuals
rename to profiles/default-linux/amd64/2007.0/desktop/virtuals
index 07340956b359..a06ab443533e 100644
--- a/profiles/default-linux/amd64/dev/2007.0/desktop/virtuals
+++ b/profiles/default-linux/amd64/2007.0/desktop/virtuals
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2007.0/desktop/virtuals,v 1.1 2007/03/08 19:09:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/desktop/virtuals,v 1.3 2007/04/13 22:11:18 wolf31o2 Exp $
 
 virtual/fam								app-admin/gamin
diff --git a/profiles/default-linux/amd64/dev/2007.0/make.defaults b/profiles/default-linux/amd64/2007.0/make.defaults
similarity index 52%
rename from profiles/default-linux/amd64/dev/2007.0/make.defaults
rename to profiles/default-linux/amd64/2007.0/make.defaults
index ebceb3892935..02bc5d3a0e6a 100644
--- a/profiles/default-linux/amd64/dev/2007.0/make.defaults
+++ b/profiles/default-linux/amd64/2007.0/make.defaults
@@ -1,14 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2007.0/make.defaults,v 1.1 2007/03/08 19:09:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/make.defaults,v 1.3 2007/04/13 22:11:18 wolf31o2 Exp $
 
 ABI=amd64
 
 # Catalyst specific settings:
-# This will be commented and replaced with just STAGE1_USE="unicode" if we do
-# not end up with a stable glibc 2.4 by 2006.1's release.
 STAGE1_USE="nptl nptlonly unicode"
 
-# General 2006.1 profile settings
+# General 2007.0 profile settings
 # These USE flags are what is common between the various sub-profiles.
-USE="cups gdbm gpm libg++ nptl nptlonly ppds unicode"
+USE="acl cups gdbm gpm libg++ nptl nptlonly unicode"
diff --git a/profiles/default-linux/amd64/dev/2007.0/no-multilib/make.defaults b/profiles/default-linux/amd64/2007.0/no-multilib/make.defaults
similarity index 71%
rename from profiles/default-linux/amd64/dev/2007.0/no-multilib/make.defaults
rename to profiles/default-linux/amd64/2007.0/no-multilib/make.defaults
index 3cbd5cec7e57..86be4c617ccc 100644
--- a/profiles/default-linux/amd64/dev/2007.0/no-multilib/make.defaults
+++ b/profiles/default-linux/amd64/2007.0/no-multilib/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2007.0/no-multilib/make.defaults,v 1.1 2007/03/08 19:09:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/no-multilib/make.defaults,v 1.3 2007/04/13 22:11:18 wolf31o2 Exp $
 
 MULTILIB_ABIS="amd64"
diff --git a/profiles/default-linux/amd64/dev/2007.0/no-multilib/package.mask b/profiles/default-linux/amd64/2007.0/no-multilib/package.mask
similarity index 96%
rename from profiles/default-linux/amd64/dev/2007.0/no-multilib/package.mask
rename to profiles/default-linux/amd64/2007.0/no-multilib/package.mask
index 47be24a50750..4935c16ebf63 100644
--- a/profiles/default-linux/amd64/dev/2007.0/no-multilib/package.mask
+++ b/profiles/default-linux/amd64/2007.0/no-multilib/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2007.0/no-multilib/package.mask,v 1.3 2007/03/30 16:03:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/no-multilib/package.mask,v 1.4 2007/04/13 22:11:18 wolf31o2 Exp $
 
 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
@@ -169,12 +169,8 @@ net-im/aim
 net-im/skype
 net-im/ymessenger
 net-misc/icaclient
-net-misc/nx
 net-misc/nx-x11-bin
 net-misc/nxclient
-net-misc/nxnode
-net-misc/nxserver-freeedition
-net-misc/nxserver-freenx
 net-p2p/sancho-bin
 net-www/netscape-flash
 net-www/nspluginwrapper
diff --git a/profiles/default-linux/amd64/dev/2007.0/no-multilib/package.use.mask b/profiles/default-linux/amd64/2007.0/no-multilib/package.use.mask
similarity index 100%
rename from profiles/default-linux/amd64/dev/2007.0/no-multilib/package.use.mask
rename to profiles/default-linux/amd64/2007.0/no-multilib/package.use.mask
diff --git a/profiles/default-linux/amd64/dev/2007.0/no-multilib/parent b/profiles/default-linux/amd64/2007.0/no-multilib/parent
similarity index 100%
rename from profiles/default-linux/amd64/dev/2007.0/no-multilib/parent
rename to profiles/default-linux/amd64/2007.0/no-multilib/parent
diff --git a/profiles/default-linux/amd64/dev/2007.0/no-multilib/use.mask b/profiles/default-linux/amd64/2007.0/no-multilib/use.mask
similarity index 100%
rename from profiles/default-linux/amd64/dev/2007.0/no-multilib/use.mask
rename to profiles/default-linux/amd64/2007.0/no-multilib/use.mask
diff --git a/profiles/default-linux/amd64/dev/2007.0/package.use.mask b/profiles/default-linux/amd64/2007.0/package.use.mask
similarity index 88%
rename from profiles/default-linux/amd64/dev/2007.0/package.use.mask
rename to profiles/default-linux/amd64/2007.0/package.use.mask
index 44ac2e5b7106..b5dca738b307 100644
--- a/profiles/default-linux/amd64/dev/2007.0/package.use.mask
+++ b/profiles/default-linux/amd64/2007.0/package.use.mask
@@ -1,6 +1,6 @@
 # !!! WARNING !!!
 # MAKE SURE YOU KEEP default-linux/amd64/package.use.mask AND
-# default-linux/amd64/(dev)?/2007.0/package.use.mask IN SYNC
+# default-linux/amd64/2007.0/package.use.mask IN SYNC
 # SEE BUG #168249 FOR DETAILS
 
 # assembler-section
@@ -83,9 +83,3 @@ net-misc/yate gsm
 # Feb 17th 2007; drizzt@gentoo.org
 # amd64 does not have an emul libao package
 games-emulation/zsnes ao
-
-# Mar 17th 2007; Petteri Räty <betelgeuse@gentoo.org>
-# (Proxying for Diego Pettenò <flameeyes@gmail.com>)
-# ASIHPI driver is supported on 64-bit systems for newer versions
-<media-sound/alsa-driver-1.0.14_rc3 alsa_cards_asihpi
-
diff --git a/profiles/default-linux/amd64/dev/2007.0/packages b/profiles/default-linux/amd64/2007.0/packages
similarity index 91%
rename from profiles/default-linux/amd64/dev/2007.0/packages
rename to profiles/default-linux/amd64/2007.0/packages
index 83caf9f305d3..ee4fcef2b8c3 100644
--- a/profiles/default-linux/amd64/dev/2007.0/packages
+++ b/profiles/default-linux/amd64/2007.0/packages
@@ -1,6 +1,6 @@
 # Copyright 2001-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2007.0/packages,v 1.1 2007/03/08 19:09:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/packages,v 1.4 2007/04/13 22:11:18 wolf31o2 Exp $
 
 # For instructions on how this file works (as an inclusion mask, primarily),
 # please refer to ${PORTDIR}/profiles/base/packages
diff --git a/profiles/default-linux/amd64/dev/2007.0/server/parent b/profiles/default-linux/amd64/2007.0/parent
similarity index 100%
rename from profiles/default-linux/amd64/dev/2007.0/server/parent
rename to profiles/default-linux/amd64/2007.0/parent
diff --git a/profiles/default-linux/amd64/dev/2007.0/server/make.defaults b/profiles/default-linux/amd64/2007.0/server/make.defaults
similarity index 75%
rename from profiles/default-linux/amd64/dev/2007.0/server/make.defaults
rename to profiles/default-linux/amd64/2007.0/server/make.defaults
index 7fe006bc9036..93efae64f0c9 100644
--- a/profiles/default-linux/amd64/dev/2007.0/server/make.defaults
+++ b/profiles/default-linux/amd64/2007.0/server/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2007.0/server/make.defaults,v 1.1 2007/03/08 19:09:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/server/make.defaults,v 1.3 2007/04/13 22:11:18 wolf31o2 Exp $
 
 USE="apache2 ldap mailwrapper mysql snmp truetype xml"
diff --git a/profiles/default-linux/amd64/2007.0/server/parent b/profiles/default-linux/amd64/2007.0/server/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/amd64/2007.0/server/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/amd64/dev/2007.0/server/profile.bashrc b/profiles/default-linux/amd64/2007.0/server/profile.bashrc
similarity index 92%
rename from profiles/default-linux/amd64/dev/2007.0/server/profile.bashrc
rename to profiles/default-linux/amd64/2007.0/server/profile.bashrc
index 842b5c990338..97415baa36c9 100644
--- a/profiles/default-linux/amd64/dev/2007.0/server/profile.bashrc
+++ b/profiles/default-linux/amd64/2007.0/server/profile.bashrc
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2007.0/server/profile.bashrc,v 1.1 2007/03/08 19:09:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/server/profile.bashrc,v 1.3 2007/04/13 22:11:18 wolf31o2 Exp $
 
 if [ "${EBUILD_PHASE}" == "setup" ]
 then
diff --git a/profiles/default-linux/amd64/dev/2007.0/use.mask b/profiles/default-linux/amd64/2007.0/use.mask
similarity index 85%
rename from profiles/default-linux/amd64/dev/2007.0/use.mask
rename to profiles/default-linux/amd64/2007.0/use.mask
index 1d59e7254cfe..be4c67d5c077 100644
--- a/profiles/default-linux/amd64/dev/2007.0/use.mask
+++ b/profiles/default-linux/amd64/2007.0/use.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/amd64/dev/2007.0/use.mask,v 1.1 2007/03/08 19:09:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/use.mask,v 1.3 2007/04/13 22:11:18 wolf31o2 Exp $
 
 # Feb 16th 2007; Simon Stelling <blubb@gentoo.org>
 # Since this profile forces >=portage-2.1.2, we can unmask all
diff --git a/profiles/default-linux/amd64/ChangeLog b/profiles/default-linux/amd64/ChangeLog
index 3dab9733dd99..76f35af53c90 100644
--- a/profiles/default-linux/amd64/ChangeLog
+++ b/profiles/default-linux/amd64/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.85 2007/04/07 01:25:23 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.86 2007/04/13 22:11:18 wolf31o2 Exp $
+
+  13 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  +2007.0/desktop/make.defaults, -dev/2007.0/desktop/make.defaults,
+  +2007.0/desktop/parent, -dev/2007.0/desktop/parent,
+  +2007.0/desktop/virtuals, -dev/2007.0/desktop/virtuals,
+  +2007.0/make.defaults, -dev/2007.0/make.defaults,
+  +2007.0/no-multilib/make.defaults, -dev/2007.0/no-multilib/make.defaults,
+  +2007.0/no-multilib/package.mask, -dev/2007.0/no-multilib/package.mask,
+  +2007.0/no-multilib/package.use.mask,
+  -dev/2007.0/no-multilib/package.use.mask, +2007.0/no-multilib/parent,
+  -dev/2007.0/no-multilib/parent, +2007.0/no-multilib/use.mask,
+  -dev/2007.0/no-multilib/use.mask, +2007.0/package.use.mask,
+  -dev/2007.0/package.use.mask, +2007.0/packages, -dev/2007.0/packages,
+  +2007.0/parent, -dev/2007.0/parent, +2007.0/server/make.defaults,
+  -dev/2007.0/server/make.defaults, +2007.0/server/parent,
+  -dev/2007.0/server/parent, +2007.0/server/profile.bashrc,
+  -dev/2007.0/server/profile.bashrc, +2007.0/use.mask, -dev/2007.0/use.mask:
+  Adding the 2007.0 profile from the release snapshot. This will allow us to
+  do final testing/QA on the release media before it hits the mirrors. This
+  profile is designed to work with the release media, so beware if you're
+  using it yourself without knowing the implications of what it will affect
+  for you.
 
   07 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> use.mask:
   Use use.mask for emf instead of !amd64 atom in media-gfx/pstoedit.
diff --git a/profiles/default-linux/amd64/dev/2007.0/desktop/make.defaults b/profiles/default-linux/amd64/dev/2007.0/desktop/make.defaults
deleted file mode 100644
index d08613b87570..000000000000
--- a/profiles/default-linux/amd64/dev/2007.0/desktop/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2007.0/desktop/make.defaults,v 1.1 2007/03/08 19:09:09 wolf31o2 Exp $
-
-# This will be commented and replaced with just STAGE1_USE="unicode" if we do
-# not end up with a stable glibc 2.4 by 2006.1's release.
-STAGE1_USE="nptl nptlonly unicode"
-
-USE="alsa arts cairo cdr dbus dvd dvdr eds emboss encode esd fam firefox gif gnome gstreamer gtk gtk2 hal jpeg kde ldap mad mikmod mp3 mpeg ogg opengl oss png qt3 qt4 quicktime sdl spell truetype vorbis win32codecs X xml xv"
diff --git a/profiles/default-linux/amd64/dev/2007.0/parent b/profiles/default-linux/amd64/dev/2007.0/parent
deleted file mode 100644
index aab0408ceca6..000000000000
--- a/profiles/default-linux/amd64/dev/2007.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-../..