Clear out masking of clustering related packages and USE flags, bug #248112

6 files changed, 10 insertions, 39 deletions

diff --git a/profiles/hardened/linux/use.mask b/profiles/hardened/linux/use.mask
index 932ba7c91909..c2110fac888a 100644
--- a/profiles/hardened/linux/use.mask
+++ b/profiles/hardened/linux/use.mask
@@ -1,16 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/use.mask,v 1.2 2008/04/03 23:10:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/use.mask,v 1.3 2009/01/11 07:36:55 gengor Exp $
 
 emul-linux-x86
 
 x264
 
-# lvm2 clustered use flags (moved from default-linux)
-clvm
-gulm
-cman
-
 # tcc is x86-only
 tcc
 
diff --git a/profiles/hardened/package.mask b/profiles/hardened/package.mask
index ac7a299900d7..49bb14e2c5a5 100644
--- a/profiles/hardened/package.mask
+++ b/profiles/hardened/package.mask
@@ -1,6 +1,6 @@
 # Copyright 2007 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.47 2008/12/31 21:42:06 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.48 2009/01/11 07:36:55 gengor Exp $
 
 # supported only by gcc-4, unmask when it's stable wrt #217927
 media-libs/libopenraw
@@ -35,9 +35,6 @@ media-gfx/gnome-raw-thumbnailer
 # 2006-03-13 kevquinn
 =sys-libs/glibc-2.4*
 
-# needs =sys-libs/glibc-2.4*
->=sys-cluster/gfs-kernel-2.02.00
-
 # These packages do more harm than good w/ hardened.
 # users must now the opensource xorg nv driver with nvidia cards.
 # By placing Driver "nv" in xorg.conf
diff --git a/profiles/hardened/use.mask b/profiles/hardened/use.mask
index 43b16785f2c1..70422be970b4 100644
--- a/profiles/hardened/use.mask
+++ b/profiles/hardened/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/use.mask,v 1.21 2008/04/18 16:57:29 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/use.mask,v 1.22 2009/01/11 07:36:55 gengor Exp $
 
 # supported only by gcc-4, unmask when it's stable wrt #217927
 raw
@@ -12,11 +12,6 @@ video_cards_nvidia
 
 x264
 
-# lvm2 clustered use flags (moved from default-linux)
-clvm
-gulm
-cman
-
 # tcc is x86-only
 tcc
 
diff --git a/profiles/hardened/x86/ChangeLog b/profiles/hardened/x86/ChangeLog
index a35e96d82723..f41f46747865 100644
--- a/profiles/hardened/x86/ChangeLog
+++ b/profiles/hardened/x86/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86 profile directory
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/ChangeLog,v 1.20 2008/12/29 20:25:40 gengor Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/ChangeLog,v 1.21 2009/01/11 07:36:55 gengor Exp $
+
+  11 Jan 2009; Gordon Malm <gengor@gentoo.org> package.mask, use.mask:
+  Clear out masking of clustering related packages, bug #248112
 
   29 Dec 2008; Gordon Malm <gengor@gentoo.org> package.mask:
   Masked RSBAC-related ebuilds for eventual removal.
diff --git a/profiles/hardened/x86/package.mask b/profiles/hardened/x86/package.mask
index 71011eefaebf..46484421b140 100644
--- a/profiles/hardened/x86/package.mask
+++ b/profiles/hardened/x86/package.mask
@@ -1,6 +1,6 @@
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/package.mask,v 1.50 2008/09/30 08:29:01 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/package.mask,v 1.51 2009/01/11 07:36:55 gengor Exp $
 
 # Chris Gianelloni <wolf31o2@gentoo.org> (20 Sep 2007)
 # mask because it requires nptl and 2.6
@@ -33,20 +33,6 @@ sys-apps/hal
 sys-apps/hwinfo
 sys-apps/ivman
 sys-apps/raidutils
-sys-cluster/cman-headers
-sys-cluster/cman-kernel
-sys-cluster/dlm-kernel
-sys-cluster/gfs-kernel
-sys-cluster/gnbd-kernel
-sys-cluster/cman
-sys-cluster/fence
-sys-cluster/gfs-headers
-#x11-misc/linuxwacom
-sys-cluster/gulm
-sys-cluster/magma-plugins
-sys-cluster/rgmanager
-sys-fs/clvm
-sys-fs/gfs
 sys-power/kpowersave
 sys-power/powersave
 media-libs/libipoddevice
diff --git a/profiles/hardened/x86/use.mask b/profiles/hardened/x86/use.mask
index bd3756442a43..9cb47d977b7e 100644
--- a/profiles/hardened/x86/use.mask
+++ b/profiles/hardened/x86/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/use.mask,v 1.30 2008/11/06 00:07:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/use.mask,v 1.31 2009/01/11 07:36:55 gengor Exp $
 
 -3dnow
 -3dnowext
@@ -27,11 +27,6 @@ hal
 v4l2
 ipod
 uml
-cman
-gulm
-
-# lvm2 cluster
--clvm
 
 # Chris Gianelloni <wolf31o2@gentoo.org> (22 Jun 2006)
 # Masking for bug #136866