Update packages syntax to avoid implicit masking. Change the baselayout in system profile depending on profile for now.

5 files changed, 61 insertions, 47 deletions

diff --git a/profiles/default-bsd/fbsd/6.1/package.mask b/profiles/default-bsd/fbsd/6.1/package.mask
index 0928cca52224..2420dfaa6bdf 100644
--- a/profiles/default-bsd/fbsd/6.1/package.mask
+++ b/profiles/default-bsd/fbsd/6.1/package.mask
@@ -1,12 +1,32 @@
 # Copyright 2004-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.1/package.mask,v 1.6 2006/09/22 19:21:27 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.1/package.mask,v 1.7 2006/10/05 10:41:00 flameeyes Exp $
 
 # Diego Pettenò <flameeyes@gentoo.org>
-# Mask pam modules from old and new FreeBSD versions
+# Make sure we don't get wrong versions
 <sys-freebsd/freebsd-pam-modules-6.1_alpha
 >sys-freebsd/freebsd-pam-modules-6.1.99
 <sys-freebsd/freebsd-rescue-6.1_alpha
 >sys-freebsd/freebsd-rescue-6.1.99
 <sys-freebsd/freebsd-pf-6.1_alpha
 >sys-freebsd/freebsd-pf-6.1.99
+<sys-freebsd/freebsd-mk-defs-6.1_alpha
+>sys-freebsd/freebsd-mk-defs-6.1.99
+<sys-freebsd/freebsd-lib-6.1_alpha
+>sys-freebsd/freebsd-lib-6.1.99
+<sys-freebsd/freebsd-libexec-6.1_alpha
+>sys-freebsd/freebsd-libexec-6.1.99
+<sys-freebsd/freebsd-bin-6.1_alpha
+>sys-freebsd/freebsd-bin-6.1.99
+<sys-freebsd/freebsd-sbin-6.1_alpha
+>sys-freebsd/freebsd-sbin-6.1.99
+<sys-freebsd/freebsd-ubin-6.1_alpha
+>sys-freebsd/freebsd-ubin-6.1.99
+<sys-freebsd/freebsd-usbin-6.1_alpha
+>sys-freebsd/freebsd-usbin-6.1.99
+<sys-freebsd/freebsd-share-6.1_alpha
+>sys-freebsd/freebsd-share-6.1.99
+<sys-freebsd/freebsd-contrib-6.1_alpha
+>sys-freebsd/freebsd-contrib-6.1.99
+<sys-freebsd/boot0-6.1_alpha
+>sys-freebsd/boot0-6.1.99
diff --git a/profiles/default-bsd/fbsd/6.1/packages b/profiles/default-bsd/fbsd/6.1/packages
index 6b57955dd38b..d14dcd856470 100644
--- a/profiles/default-bsd/fbsd/6.1/packages
+++ b/profiles/default-bsd/fbsd/6.1/packages
@@ -1,24 +1,5 @@
 # Copyright 2004-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.1/packages,v 1.1 2006/04/30 20:13:52 flameeyes Exp $
-
-# General guideline for package versioning: 
-#  * FreeBSD packages are =package-6.1*
-#  * For stuff in contrib/, take the version that FreeBSD contains, and add a ~.
-#  * For packages not provided by FreeBSD, be lenient. Look at what x86 do, etc.
-
-###
-# FreeBSD System
-###
-*=sys-freebsd/freebsd-mk-defs-6.1*
-*=sys-freebsd/freebsd-lib-6.1*
-*=sys-freebsd/freebsd-libexec-6.1*
-*=sys-freebsd/freebsd-bin-6.1*
-*=sys-freebsd/freebsd-sbin-6.1*
-*=sys-freebsd/freebsd-ubin-6.1*
-*=sys-freebsd/freebsd-usbin-6.1*
-*sys-freebsd/freebsd-baselayout
-*=sys-freebsd/freebsd-share-6.1*
-*=sys-freebsd/freebsd-contrib-6.1*
-*=sys-freebsd/boot0-6.1*
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.1/packages,v 1.2 2006/10/05 10:41:00 flameeyes Exp $
 
+*sys-freebsd/freebsd-baselayout
\ No newline at end of file
diff --git a/profiles/default-bsd/fbsd/6.2/package.mask b/profiles/default-bsd/fbsd/6.2/package.mask
index 3c93e10fe2c9..3684dff083b9 100644
--- a/profiles/default-bsd/fbsd/6.2/package.mask
+++ b/profiles/default-bsd/fbsd/6.2/package.mask
@@ -1,16 +1,39 @@
 # Copyright 2004-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.2/package.mask,v 1.2 2006/10/04 10:52:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.2/package.mask,v 1.3 2006/10/05 10:41:00 flameeyes Exp $
 
 # Diego Pettenò <flameeyes@gentoo.org>
-# Mask pam modules from old and new FreeBSD versions
+# Make sure we don't get wrong versions
 <sys-freebsd/freebsd-pam-modules-6.2_alpha
 >sys-freebsd/freebsd-pam-modules-6.2.99
 <sys-freebsd/freebsd-rescue-6.2_alpha
 >sys-freebsd/freebsd-rescue-6.2.99
+<sys-freebsd/freebsd-pf-6.2_alpha
+>sys-freebsd/freebsd-pf-6.2.99
+<sys-freebsd/freebsd-mk-defs-6.2_alpha
+>sys-freebsd/freebsd-mk-defs-6.2.99
+<sys-freebsd/freebsd-lib-6.2_alpha
+>sys-freebsd/freebsd-lib-6.2.99
+<sys-freebsd/freebsd-libexec-6.2_alpha
+>sys-freebsd/freebsd-libexec-6.2.99
+<sys-freebsd/freebsd-bin-6.2_alpha
+>sys-freebsd/freebsd-bin-6.2.99
+<sys-freebsd/freebsd-sbin-6.2_alpha
+>sys-freebsd/freebsd-sbin-6.2.99
+<sys-freebsd/freebsd-ubin-6.2_alpha
+>sys-freebsd/freebsd-ubin-6.2.99
+<sys-freebsd/freebsd-usbin-6.2_alpha
+>sys-freebsd/freebsd-usbin-6.2.99
+<sys-freebsd/freebsd-share-6.2_alpha
+>sys-freebsd/freebsd-share-6.2.99
+<sys-freebsd/freebsd-contrib-6.2_alpha
+>sys-freebsd/freebsd-contrib-6.2.99
+<sys-freebsd/boot0-6.2_alpha
+>sys-freebsd/boot0-6.2.99
 
 # Diego Pettenò <flameeyes@gentoo.org> (4 Oct 2006)
 # We want this unmasked as is the only baselayout usable here
 ->=sys-apps/baselayout-1.13.0_alpha1
 # And this masked as we cannot use this anymore
 sys-freebsd/freebsd-baselayout
+<sys-apps/baselayout-1.13.0_alpha1
\ No newline at end of file
diff --git a/profiles/default-bsd/fbsd/6.2/packages b/profiles/default-bsd/fbsd/6.2/packages
index 33e1ee5ed03d..2e895f8fa897 100644
--- a/profiles/default-bsd/fbsd/6.2/packages
+++ b/profiles/default-bsd/fbsd/6.2/packages
@@ -1,25 +1,5 @@
 # Copyright 2004-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.2/packages,v 1.1 2006/09/21 20:53:56 flameeyes Exp $
-
-# General guideline for package versioning: 
-#  * FreeBSD packages are =package-6.2*
-#  * For stuff in contrib/, take the version that FreeBSD contains, and add a ~.
-#  * For packages not provided by FreeBSD, be lenient. Look at what x86 do, etc.
-
-###
-# FreeBSD System
-###
-*=sys-freebsd/freebsd-mk-defs-6.2*
-*=sys-freebsd/freebsd-lib-6.2*
-*=sys-freebsd/freebsd-libexec-6.2*
-*=sys-freebsd/freebsd-bin-6.2*
-*=sys-freebsd/freebsd-sbin-6.2*
-*=sys-freebsd/freebsd-ubin-6.2*
-*=sys-freebsd/freebsd-usbin-6.2*
-*=sys-freebsd/freebsd-share-6.2*
-*=sys-freebsd/freebsd-contrib-6.2*
-*=sys-freebsd/boot0-6.2*
-
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.2/packages,v 1.2 2006/10/05 10:41:00 flameeyes Exp $
 
 *>=sys-apps/baselayout-1.13_alpha
diff --git a/profiles/default-bsd/fbsd/packages b/profiles/default-bsd/fbsd/packages
index 29a12a233f12..8aaf48c6ea9e 100644
--- a/profiles/default-bsd/fbsd/packages
+++ b/profiles/default-bsd/fbsd/packages
@@ -1,6 +1,6 @@
 # Copyright 2004-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/packages,v 1.3 2006/04/22 13:08:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/packages,v 1.4 2006/10/05 10:40:59 flameeyes Exp $
 
 # This files contains a small list of packages that define a 
 # minimal FreeBSD system. DO NOT change this without contacting
@@ -8,6 +8,16 @@
 #
 *sys-freebsd/freebsd-mk-defs
 *sys-freebsd/freebsd-sources
+*sys-freebsd/freebsd-mk-defs
+*sys-freebsd/freebsd-lib
+*sys-freebsd/freebsd-libexec
+*sys-freebsd/freebsd-bin
+*sys-freebsd/freebsd-sbin
+*sys-freebsd/freebsd-ubin
+*sys-freebsd/freebsd-usbin
+*sys-freebsd/freebsd-share
+*sys-freebsd/freebsd-contrib
+*sys-freebsd/boot0
 
 *sys-devel/gettext
 *dev-libs/libiconv