diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-06-14 09:41:38 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-06-14 09:41:38 +0000 |
| commit | ad746fe2ef6d8d11c4f819596bb6a3eead70fb6b (patch) | |
| tree | c4c1a09d6af98c7feb5f34929c03c6285525974e | |
| parent | Version bumped. (diff) | |
| download | gentoo-2-ad746fe2ef6d8d11c4f819596bb6a3eead70fb6b.tar.gz gentoo-2-ad746fe2ef6d8d11c4f819596bb6a3eead70fb6b.tar.bz2 gentoo-2-ad746fe2ef6d8d11c4f819596bb6a3eead70fb6b.zip | |
Move kernels and elibcs from the Prefix profiles to base
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/base/use.mask | 23 | ||||
| -rw-r--r-- | profiles/prefix/use.mask | 26 |
3 files changed, 26 insertions, 29 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index ce8cb9356ad1..e2705854973b 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.2778 2009/06/13 23:57:15 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.2779 2009/06/14 09:41:37 grobian Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! + 14 Jun 2009; Fabian Groffen <grobian@gentoo.org> base/use.mask, + prefix/use.mask: + Move kernels and elibcs from the Prefix profiles to base + 13 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org> package.mask: Masked for removal in 30 days. Old and dead by upstream. diff --git a/profiles/base/use.mask b/profiles/base/use.mask index f2419a66500b..32ea66dedd9b 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -94,16 +94,31 @@ infopipe psyco # Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles. +userland_BSD + +elibc_AIX +elibc_Darwin +elibc_DragonFly elibc_FreeBSD +elibc_HPUX +elibc_Interix +elibc_IRIX +elibc_mintlib elibc_NetBSD elibc_OpenBSD -elibc_Darwin -elibc_DragonFly +elibc_SunOS elibc_uclibc + +kernel_AIX kernel_Darwin kernel_FreeBSD -userland_BSD -userland_Darwin +kernel_freemint +kernel_HPUX +kernel_Interix +kernel_IRIX +kernel_NetBSD +kernel_OpenBSD +kernel_SunOS # Diego Pettenò <flameeyes@gentoo.org> (6 Dec 2006) # Mask specific Apple drivers diff --git a/profiles/prefix/use.mask b/profiles/prefix/use.mask index a764c486fcc7..52a965973529 100644 --- a/profiles/prefix/use.mask +++ b/profiles/prefix/use.mask @@ -1,34 +1,12 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/use.mask,v 1.1 2009/06/06 03:54:33 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/use.mask,v 1.2 2009/06/14 09:41:38 grobian Exp $ # multilib is never going to work as expected in Prefix multilib -# Mask all elibc/kernel combinations, unmasked in the appropriate -# profiles -elibc_AIX -elibc_Darwin -elibc_FreeBSD -elibc_HPUX -elibc_IRIX -elibc_Interix -elibc_NetBSD -elibc_OpenBSD -elibc_SunOS +# Mask all glibc/linux combination, unmasked in the appropriate profiles elibc_glibc -elibc_mintlib - -kernel_AIX -kernel_Darwin -kernel_FreeBSD -kernel_HPUX -kernel_IRIX -kernel_Interix -kernel_NetBSD -kernel_OpenBSD -kernel_SunOS -kernel_freemint kernel_linux # re-add userland GNU |