get all profiles to use the latest automake; gnome2 masks

9 files changed, 15 insertions, 12 deletions

diff --git a/profiles/default-1.0-gcc3/packages b/profiles/default-1.0-gcc3/packages
index c78bbdcc7618..becaa3ae88cd 100644
--- a/profiles/default-1.0-gcc3/packages
+++ b/profiles/default-1.0-gcc3/packages
@@ -96,7 +96,7 @@
 *sys-apps/util-linux
 *sys-apps/which
 *sys-devel/autoconf
-*sys-devel/automake
+*>=sys-devel/automake-1.6.1-r5
 *sys-devel/bc
 *sys-devel/bin86
 *sys-devel/bison
diff --git a/profiles/default-1.0/packages b/profiles/default-1.0/packages
index e0ef2f3961af..e3bb43680585 100644
--- a/profiles/default-1.0/packages
+++ b/profiles/default-1.0/packages
@@ -97,7 +97,7 @@
 *sys-apps/util-linux
 *sys-apps/which
 *sys-devel/autoconf
-*sys-devel/automake
+*>=sys-devel/automake-1.6.1-r5
 *sys-devel/bc
 *sys-devel/bin86
 *sys-devel/bison
diff --git a/profiles/default-1.0_rc6/packages b/profiles/default-1.0_rc6/packages
index c809f3d84e5a..ec0aac97befe 100644
--- a/profiles/default-1.0_rc6/packages
+++ b/profiles/default-1.0_rc6/packages
@@ -97,7 +97,7 @@
 *sys-apps/util-linux
 *sys-apps/which
 *sys-devel/autoconf
-*sys-devel/automake
+*>=sys-devel/automake-1.6.1-r5
 *sys-devel/bc
 *sys-devel/bin86
 *sys-devel/bison
diff --git a/profiles/default-ppc-1.0/packages b/profiles/default-ppc-1.0/packages
index a5b0c69e5025..d27da7bfaf76 100644
--- a/profiles/default-ppc-1.0/packages
+++ b/profiles/default-ppc-1.0/packages
@@ -159,7 +159,7 @@ net-misc/rsync
 *sys-apps/util-linux
 *sys-apps/which
 *sys-devel/autoconf
-*sys-devel/automake
+*>=sys-devel/automake-1.6.1-r5
 *sys-devel/bc
 *sys-devel/bison
 *sys-devel/flex
diff --git a/profiles/default-ppc-1.0_rc6/packages b/profiles/default-ppc-1.0_rc6/packages
index e8218b9ef154..05e51d79f57c 100644
--- a/profiles/default-ppc-1.0_rc6/packages
+++ b/profiles/default-ppc-1.0_rc6/packages
@@ -98,7 +98,7 @@
 *sys-apps/util-linux
 *sys-apps/which
 *sys-devel/autoconf
-*sys-devel/automake
+*>=sys-devel/automake-1.6.1-r5
 *sys-devel/bc
 *sys-devel/bin86
 *sys-devel/bison
diff --git a/profiles/default-ppc/packages b/profiles/default-ppc/packages
index 49461300d787..61c1778353b9 100644
--- a/profiles/default-ppc/packages
+++ b/profiles/default-ppc/packages
@@ -109,7 +109,7 @@ net-misc/rsync
 *sys-apps/util-linux
 *sys-apps/which
 *sys-devel/autoconf
-*sys-devel/automake
+*>=sys-devel/automake-1.6.1-r5
 *sys-devel/bc
 *sys-devel/bison
 *sys-devel/flex
diff --git a/profiles/default-sparc-1.0/packages b/profiles/default-sparc-1.0/packages
index 1a768dbdff0b..b983a1a6235e 100644
--- a/profiles/default-sparc-1.0/packages
+++ b/profiles/default-sparc-1.0/packages
@@ -99,7 +99,7 @@
 *sys-apps/util-linux
 *sys-apps/which
 *sys-devel/autoconf
-*sys-devel/automake
+*>=sys-devel/automake-1.6.1-r5
 *sys-devel/bc
 #*sys-devel/bin86
 *sys-devel/bison
@@ -169,7 +169,7 @@
 <=sys-apps/tcp-wrappers-7.6-r3
 
 # These lines added by scripts/generate-packages.sh
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages,v 1.11 2002/05/11 01:40:21 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages,v 1.12 2002/06/24 01:35:46 azarah Exp $
 #
 # Please edit the file packages.sparc, it will be included in
 # packages the next time you run generate-packages.sh
diff --git a/profiles/default-sparc64-1.0/packages b/profiles/default-sparc64-1.0/packages
index 8a22ee1a3ea8..8e2b20526ac9 100644
--- a/profiles/default-sparc64-1.0/packages
+++ b/profiles/default-sparc64-1.0/packages
@@ -99,7 +99,7 @@
 *sys-apps/util-linux
 *sys-apps/which
 *sys-devel/autoconf
-*sys-devel/automake
+*>=sys-devel/automake-1.6.1-r5
 *sys-devel/bc
 #*sys-devel/bin86
 *sys-devel/bison
@@ -169,7 +169,7 @@
 <=sys-apps/tcp-wrappers-7.6-r3
 
 # These lines added by /usr/portage/profiles/default-sparc-1.0/scripts/generate-packages.sh
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.0/packages,v 1.11 2002/05/11 01:43:34 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.0/packages,v 1.12 2002/06/24 01:35:46 azarah Exp $
 #
 # Please edit the file packages.sparc, it will be included in
 # packages the next time you run generate-packages.sh
diff --git a/profiles/package.mask b/profiles/package.mask
index 95e1d312d932..bfba7bedf8e5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -697,9 +697,12 @@ gnome-extra/at-spi
 gnome-extra/at-poke
 
 
-
+# Gnome2 users should only comment sawfish-2.0,
+# and leave sawfish-20020419 and up masked.
+>=x11-wm/sawfish-2.0
 >=x11-wm/sawfish-20020419
->=x11-libs/rep-gtk-20020419
+
+>=x11-libs/rep-gtk-0.16
 >=dev-libs/librep-20020201
 
 >=x11-libs/gtk-engines-1.9.0