From 712984676b7dd0263b4ac07e611098e83903d476 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 8 Mar 2007 19:09:09 +0000 Subject: [PATCH] Moving the 2007.0 profile to dev, where it belongs. If you are using this and you were not asked to do so, you're on your own and you've been warned. --- .../default-linux/amd64/2007.0/server/parent | 1 - profiles/default-linux/amd64/ChangeLog | 21 ++++++++++++++++++- .../{ => dev}/2007.0/desktop/make.defaults | 2 +- .../amd64/{ => dev}/2007.0/desktop/parent | 0 .../amd64/{ => dev}/2007.0/desktop/virtuals | 2 +- .../amd64/{ => dev}/2007.0/make.defaults | 2 +- .../2007.0/no-multilib/make.defaults | 2 +- .../{ => dev}/2007.0/no-multilib/package.mask | 2 +- .../2007.0/no-multilib/package.use.mask | 0 .../amd64/{ => dev}/2007.0/no-multilib/parent | 0 .../{ => dev}/2007.0/no-multilib/use.mask | 0 .../amd64/{ => dev}/2007.0/package.use.mask | 0 .../amd64/{ => dev}/2007.0/packages | 2 +- .../default-linux/amd64/dev/2007.0/parent | 1 + .../{ => dev}/2007.0/server/make.defaults | 2 +- .../{2007.0 => dev/2007.0/server}/parent | 0 .../{ => dev}/2007.0/server/profile.bashrc | 2 +- .../amd64/{ => dev}/2007.0/use.mask | 2 +- 18 files changed, 30 insertions(+), 11 deletions(-) delete mode 100644 profiles/default-linux/amd64/2007.0/server/parent rename profiles/default-linux/amd64/{ => dev}/2007.0/desktop/make.defaults (88%) rename profiles/default-linux/amd64/{ => dev}/2007.0/desktop/parent (100%) rename profiles/default-linux/amd64/{ => dev}/2007.0/desktop/virtuals (75%) rename profiles/default-linux/amd64/{ => dev}/2007.0/make.defaults (89%) rename profiles/default-linux/amd64/{ => dev}/2007.0/no-multilib/make.defaults (71%) rename profiles/default-linux/amd64/{ => dev}/2007.0/no-multilib/package.mask (98%) rename profiles/default-linux/amd64/{ => dev}/2007.0/no-multilib/package.use.mask (100%) rename profiles/default-linux/amd64/{ => dev}/2007.0/no-multilib/parent (100%) rename profiles/default-linux/amd64/{ => dev}/2007.0/no-multilib/use.mask (100%) rename profiles/default-linux/amd64/{ => dev}/2007.0/package.use.mask (100%) rename profiles/default-linux/amd64/{ => dev}/2007.0/packages (91%) create mode 100644 profiles/default-linux/amd64/dev/2007.0/parent rename profiles/default-linux/amd64/{ => dev}/2007.0/server/make.defaults (75%) rename profiles/default-linux/amd64/{2007.0 => dev/2007.0/server}/parent (100%) rename profiles/default-linux/amd64/{ => dev}/2007.0/server/profile.bashrc (92%) rename profiles/default-linux/amd64/{ => dev}/2007.0/use.mask (85%) diff --git a/profiles/default-linux/amd64/2007.0/server/parent b/profiles/default-linux/amd64/2007.0/server/parent deleted file mode 100644 index f3229c5b9876..000000000000 --- a/profiles/default-linux/amd64/2007.0/server/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/default-linux/amd64/ChangeLog b/profiles/default-linux/amd64/ChangeLog index 254f9d1a9b3f..66059eb09ecb 100644 --- a/profiles/default-linux/amd64/ChangeLog +++ b/profiles/default-linux/amd64/ChangeLog @@ -1,6 +1,25 @@ # 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.79 2007/03/02 14:08:17 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.80 2007/03/08 19:09:09 wolf31o2 Exp $ + + 08 Mar 2007; Chris Gianelloni + -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: + Moving the 2007.0 profile to dev, where it belongs. If you are using this + and you were not asked to do so, you're on your own and you've been warned. 02 Mar 2007; Simon Stelling +2007.0/package.use.mask, package.use.mask: diff --git a/profiles/default-linux/amd64/2007.0/desktop/make.defaults b/profiles/default-linux/amd64/dev/2007.0/desktop/make.defaults similarity index 88% rename from profiles/default-linux/amd64/2007.0/desktop/make.defaults rename to profiles/default-linux/amd64/dev/2007.0/desktop/make.defaults index e2afb912e7ff..d08613b87570 100644 --- a/profiles/default-linux/amd64/2007.0/desktop/make.defaults +++ b/profiles/default-linux/amd64/dev/2007.0/desktop/make.defaults @@ -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/2007.0/desktop/make.defaults,v 1.1 2007/02/14 17:55:19 kugelfang Exp $ +# $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. diff --git a/profiles/default-linux/amd64/2007.0/desktop/parent b/profiles/default-linux/amd64/dev/2007.0/desktop/parent similarity index 100% rename from profiles/default-linux/amd64/2007.0/desktop/parent rename to profiles/default-linux/amd64/dev/2007.0/desktop/parent diff --git a/profiles/default-linux/amd64/2007.0/desktop/virtuals b/profiles/default-linux/amd64/dev/2007.0/desktop/virtuals similarity index 75% rename from profiles/default-linux/amd64/2007.0/desktop/virtuals rename to profiles/default-linux/amd64/dev/2007.0/desktop/virtuals index 84c6b1599877..07340956b359 100644 --- a/profiles/default-linux/amd64/2007.0/desktop/virtuals +++ b/profiles/default-linux/amd64/dev/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/2007.0/desktop/virtuals,v 1.1 2007/02/14 17:55:19 kugelfang Exp $ +# $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 $ virtual/fam app-admin/gamin diff --git a/profiles/default-linux/amd64/2007.0/make.defaults b/profiles/default-linux/amd64/dev/2007.0/make.defaults similarity index 89% rename from profiles/default-linux/amd64/2007.0/make.defaults rename to profiles/default-linux/amd64/dev/2007.0/make.defaults index a0c4245ef66f..ebceb3892935 100644 --- a/profiles/default-linux/amd64/2007.0/make.defaults +++ b/profiles/default-linux/amd64/dev/2007.0/make.defaults @@ -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/2007.0/make.defaults,v 1.1 2007/02/14 17:55:19 kugelfang Exp $ +# $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 $ ABI=amd64 diff --git a/profiles/default-linux/amd64/2007.0/no-multilib/make.defaults b/profiles/default-linux/amd64/dev/2007.0/no-multilib/make.defaults similarity index 71% rename from profiles/default-linux/amd64/2007.0/no-multilib/make.defaults rename to profiles/default-linux/amd64/dev/2007.0/no-multilib/make.defaults index bbc05e292880..3cbd5cec7e57 100644 --- a/profiles/default-linux/amd64/2007.0/no-multilib/make.defaults +++ b/profiles/default-linux/amd64/dev/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/2007.0/no-multilib/make.defaults,v 1.1 2007/02/14 17:55:19 kugelfang Exp $ +# $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 $ MULTILIB_ABIS="amd64" diff --git a/profiles/default-linux/amd64/2007.0/no-multilib/package.mask b/profiles/default-linux/amd64/dev/2007.0/no-multilib/package.mask similarity index 98% rename from profiles/default-linux/amd64/2007.0/no-multilib/package.mask rename to profiles/default-linux/amd64/dev/2007.0/no-multilib/package.mask index 75f95b3aaf24..3744c772a911 100644 --- a/profiles/default-linux/amd64/2007.0/no-multilib/package.mask +++ b/profiles/default-linux/amd64/dev/2007.0/no-multilib/package.mask @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2007.0/no-multilib/package.mask,v 1.2 2007/02/28 15:08:19 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2007.0/no-multilib/package.mask,v 1.1 2007/03/08 19:09:09 wolf31o2 Exp $ # AMD64 Team # Mask packages that rely on amd64 multilib diff --git a/profiles/default-linux/amd64/2007.0/no-multilib/package.use.mask b/profiles/default-linux/amd64/dev/2007.0/no-multilib/package.use.mask similarity index 100% rename from profiles/default-linux/amd64/2007.0/no-multilib/package.use.mask rename to profiles/default-linux/amd64/dev/2007.0/no-multilib/package.use.mask diff --git a/profiles/default-linux/amd64/2007.0/no-multilib/parent b/profiles/default-linux/amd64/dev/2007.0/no-multilib/parent similarity index 100% rename from profiles/default-linux/amd64/2007.0/no-multilib/parent rename to profiles/default-linux/amd64/dev/2007.0/no-multilib/parent diff --git a/profiles/default-linux/amd64/2007.0/no-multilib/use.mask b/profiles/default-linux/amd64/dev/2007.0/no-multilib/use.mask similarity index 100% rename from profiles/default-linux/amd64/2007.0/no-multilib/use.mask rename to profiles/default-linux/amd64/dev/2007.0/no-multilib/use.mask diff --git a/profiles/default-linux/amd64/2007.0/package.use.mask b/profiles/default-linux/amd64/dev/2007.0/package.use.mask similarity index 100% rename from profiles/default-linux/amd64/2007.0/package.use.mask rename to profiles/default-linux/amd64/dev/2007.0/package.use.mask diff --git a/profiles/default-linux/amd64/2007.0/packages b/profiles/default-linux/amd64/dev/2007.0/packages similarity index 91% rename from profiles/default-linux/amd64/2007.0/packages rename to profiles/default-linux/amd64/dev/2007.0/packages index dbe6758b6596..83caf9f305d3 100644 --- a/profiles/default-linux/amd64/2007.0/packages +++ b/profiles/default-linux/amd64/dev/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/2007.0/packages,v 1.2 2007/02/16 12:33:45 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/2007.0/packages,v 1.1 2007/03/08 19:09:09 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/parent b/profiles/default-linux/amd64/dev/2007.0/parent new file mode 100644 index 000000000000..aab0408ceca6 --- /dev/null +++ b/profiles/default-linux/amd64/dev/2007.0/parent @@ -0,0 +1 @@ +../.. diff --git a/profiles/default-linux/amd64/2007.0/server/make.defaults b/profiles/default-linux/amd64/dev/2007.0/server/make.defaults similarity index 75% rename from profiles/default-linux/amd64/2007.0/server/make.defaults rename to profiles/default-linux/amd64/dev/2007.0/server/make.defaults index 6ec7ec6b6994..7fe006bc9036 100644 --- a/profiles/default-linux/amd64/2007.0/server/make.defaults +++ b/profiles/default-linux/amd64/dev/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/2007.0/server/make.defaults,v 1.1 2007/02/14 17:55:19 kugelfang Exp $ +# $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 $ USE="apache2 ldap mailwrapper mysql snmp truetype xml" diff --git a/profiles/default-linux/amd64/2007.0/parent b/profiles/default-linux/amd64/dev/2007.0/server/parent similarity index 100% rename from profiles/default-linux/amd64/2007.0/parent rename to profiles/default-linux/amd64/dev/2007.0/server/parent diff --git a/profiles/default-linux/amd64/2007.0/server/profile.bashrc b/profiles/default-linux/amd64/dev/2007.0/server/profile.bashrc similarity index 92% rename from profiles/default-linux/amd64/2007.0/server/profile.bashrc rename to profiles/default-linux/amd64/dev/2007.0/server/profile.bashrc index 4afa3b61ca6a..842b5c990338 100644 --- a/profiles/default-linux/amd64/2007.0/server/profile.bashrc +++ b/profiles/default-linux/amd64/dev/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/2007.0/server/profile.bashrc,v 1.1 2007/02/14 17:55:19 kugelfang Exp $ +# $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 $ if [ "${EBUILD_PHASE}" == "setup" ] then diff --git a/profiles/default-linux/amd64/2007.0/use.mask b/profiles/default-linux/amd64/dev/2007.0/use.mask similarity index 85% rename from profiles/default-linux/amd64/2007.0/use.mask rename to profiles/default-linux/amd64/dev/2007.0/use.mask index 43433efb845e..1d59e7254cfe 100644 --- a/profiles/default-linux/amd64/2007.0/use.mask +++ b/profiles/default-linux/amd64/dev/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/2007.0/use.mask,v 1.1 2007/02/16 12:33:45 blubb Exp $ +# $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 $ # Feb 16th 2007; Simon Stelling # Since this profile forces >=portage-2.1.2, we can unmask all -- 2.26.2