Drop packages planned for removal.

22 files changed, 0 insertions, 1401 deletions

diff --git a/sys-fs/clvm/ChangeLog b/sys-fs/clvm/ChangeLog
deleted file mode 100644
index 809a60fb05f8..000000000000
--- a/sys-fs/clvm/ChangeLog
+++ /dev/null
@@ -1,142 +0,0 @@
-# ChangeLog for sys-fs/clvm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/ChangeLog,v 1.29 2009/07/22 01:02:25 robbat2 Exp $
-
-*clvm-2.02.45 (22 Jul 2009)
-
-  22 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> +clvm-2.02.45.ebuild:
-  Bug #265671: clvm package is obsolete. Migrate to sys-fs/lvm2[clvm].
-
-  22 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> files/clvmd.confd,
-  files/clvmd.rc, clvm-2.02.39.ebuild:
-  Merged an improved init script.
-
-  22 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> clvm-2.02.39.ebuild:
-  Removed invalid IUSE.
-
-*clvm-2.02.39 (22 Nov 2008)
-
-  22 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
-  -files/lvm.confd-2.02.28-r2, -files/lvm.rc-2.02.28-r2,
-  -files/clvmd.rc-2.02.33-xm, -files/cluster-locking-built-in.patch,
-  +files/clvmd.confd, files/clvmd.rc, +files/lvm.confd, +files/lvm.rc,
-  files/lvm2-start.sh, files/lvm2-stop.sh, -files/lvm2-start.sh-2.02.33-xm,
-  -files/lvm2-stop.sh-2.02.33-xm, -clvm-2.02.36.ebuild,
-  +clvm-2.02.39.ebuild:
-  Version bump, removed a broken version, new init.
-
-*clvm-2.02.36 (14 Nov 2008)
-
-  14 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> metadata.xml,
-  -clvm-2.01.15.ebuild, -clvm-2.02.09.ebuild, -clvm-2.02.33.ebuild,
-  +clvm-2.02.36.ebuild:
-  Ebuild cleanup, version bump.
-
-  14 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> metadata.xml,
-  clvm-2.01.15.ebuild, clvm-2.02.09.ebuild:
-  Removed gulm support which is deprecated.
-
-  22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-  29 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
-  +files/cluster-locking-built-in.patch, files/clvmd.rc,
-  clvm-2.02.33.ebuild:
-  Added locking patch and fixed patching.
-
-*clvm-2.02.33 (17 Mar 2008)
-
-  17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
-  +files/lvm.confd-2.02.28-r2, +files/lvm.rc-2.02.28-r2,
-  +files/clvmd.rc-2.02.33-xm, +files/lvm2-start.sh-2.02.33-xm,
-  +files/lvm2-stop.sh-2.02.33-xm, +files/lvm.conf-2.02.33.patch,
-  clvm-2.01.15.ebuild, clvm-2.02.09.ebuild, +clvm-2.02.33.ebuild:
-  Version bump, clvm-2.02.33 will be the starting point to merge clvm in lvm,
-  everything before 2.02.33 will be removed soon.
-
-  26 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
-  Update for cluster herd split to hp-cluster and ha-cluster.
-
-  18 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org> clvm-2.01.15.ebuild,
-  clvm-2.02.09.ebuild:
-  Readded dlm dependency, fixed bug #151808.
-
-  15 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org> clvm-2.01.15.ebuild,
-  clvm-2.02.09.ebuild:
-  Removed dlm dependency.
-
-  15 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org> -clvm-2.02.05.ebuild,
-  -clvm-2.02.07.ebuild:
-  Ebuild cleanup.
-
-*clvm-2.02.09 (02 Sep 2006)
-
-  02 Sep 2006; Christian Zoffoli <xmerlin@gentoo.org> +clvm-2.02.09.ebuild:
-  Version bump.
-
-*clvm-2.02.07 (24 Jul 2006)
-
-  24 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org> clvm-2.02.05.ebuild,
-  +clvm-2.02.07.ebuild:
-  Version bump. Added snapshot / mirroring / gfs pool support.
-
-  14 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org>
-  files/digest-clvm-2.01.15, files/digest-clvm-2.02.05, Manifest:
-  Recommit, digest fix.
-
-  13 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org> +files/lvm2-start.sh,
-  +files/lvm2-stop.sh, clvm-2.01.15.ebuild, clvm-2.02.05.ebuild:
-  Fixed bug #139331, thanks to Ramon <ramon@vanalteren.nl>.
-
-  06 Jul 2006; Simon Stelling <blubb@gentoo.org> clvm-2.02.05.ebuild:
-  added ~amd64 keyword
-
-  28 May 2006; Christian Zoffoli <xmerlin@gentoo.org> clvm-2.01.15.ebuild:
-  Stable x86.
-
-  17 May 2006; Christian Zoffoli <xmerlin@gentoo.org> files/clvmd.rc:
-  Fixed clvmd start order. Thanks to Frank Schliefer <f_schliefer@vcc.de>.
-
-*clvm-2.02.05 (30 Apr 2006)
-*clvm-2.01.15 (30 Apr 2006)
-
-  30 Apr 2006; Christian Zoffoli <xmerlin@gentoo.org> -clvm-2.01.09.ebuild,
-  +clvm-2.01.15.ebuild, +clvm-2.02.05.ebuild:
-  Version bumps.
-
-  17 Nov 2005; Christian Zoffoli <xmerlin@gentoo.org> clvm-2.01.09.ebuild:
-  Fixed dependency. Closed bug #110814.
-
-  12 Sep 2005; Christian Zoffoli <xmerlin@gentoo.org> clvm-2.01.09.ebuild:
-  fixed cman dep.
-
-  14 Jul 2005; Christian Zoffoli <xmerlin@gentoo.org> clvm-2.01.09.ebuild:
-  removed static stuff. Closed bug #98530.
-
-  06 Jul 2005; Christian Zoffoli <xmerlin@gentoo.org> clvm-2.01.09.ebuild:
-  temporary removed gulm dependency.
-
-*clvm-2.01.09 (01 Jul 2005)
-
-  01 Jul 2005; Christian Zoffoli <xmerlin@gentoo.org> -clvm-2.00.33.ebuild,
-  +clvm-2.01.09.ebuild:
-  clvm-2.01.09 added to portage, removed old ebuild
-
-  26 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> clvm-2.00.33.ebuild:
-  fixed url
-
-  25 Mar 2005; Sven Wegener <swegener@gentoo.org> clvm-2.00.33.ebuild:
-  Fixed invalid atoms in *DEPEND. Use MY_P. Install initscript in correct
-  location.
-
-  25 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> :
-  improved init script (added dm-mod loading, merged lvm2-start/stop routines),
-  removed old lvm2-start/stop scripts
-
-*clvm-2.00.33 (25 Mar 2005)
-
-  25 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> +metadata.xml,
-  +files/clvmd.rc, +files/lvm2-start.sh, +files/lvm2-stop.sh,
-  +clvm-2.00.33.ebuild:
-  new in portage
-
diff --git a/sys-fs/clvm/Manifest b/sys-fs/clvm/Manifest
deleted file mode 100644
index 50f1d2ba900f..000000000000
--- a/sys-fs/clvm/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX clvmd.confd 213 RMD160 d23f8acd6a844e05a3e0da83939513ef0dfab0d8 SHA1 546bfd48a7cfd7e7ffff07861f90e2b8ee29d436 SHA256 68442d5c9da81bad79fa6b1beaede290f24ea6a4e4415f3d9f4e37ccca6c524a
-AUX clvmd.rc 3670 RMD160 df6c9c8b5922609ca0a9775e510e681e24d6d443 SHA1 b7fef52159a0d9d190be02c1d796a968faf095d2 SHA256 3a016426953a45cc6c9bd0e1b43549c4f1dcf01c5e7d60205e20bea53f35b577
-AUX lvm.conf-2.02.33.patch 3136 RMD160 c0292c39db064f0a4151ffccdc441be2fa78f8cf SHA1 8dbcbf66a841cc8acd889e174095df9932813a3e SHA256 63a8c21186f47979cb628970dca12df2a9f319745488a4d8a1e01f238a7fc711
-AUX lvm.confd 173 RMD160 cf554372fa11df056e3757e5139fad6c7606a696 SHA1 e8186ebb91d12247d0865285dc62346d1cbc207a SHA256 28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844
-AUX lvm.rc 628 RMD160 8a71c99d1e4676bc56f42893faf4e398d21709e8 SHA1 24a070e3a27fad3498a84b4f7b92a834d544e9a4 SHA256 2abdc3d061cdc8edeabaae591296426475d64a0839590c06aeb8a71b682dd81a
-AUX lvm2-start.sh 1171 RMD160 6ab8a328e61316291fb0b3d924bd79af6b1c4f3f SHA1 b63584a727606fbd1cc12bf2256747f16211ca83 SHA256 f096f1931e16cc99e27fdfa7326681bcd48b073a94dd21120caf4508d584abe8
-AUX lvm2-stop.sh 1941 RMD160 8a0cd0b78d73a987cd996c91cc4dd34ad795d9f2 SHA1 50765535b0ceda005f588be5ca1768c570f3de17 SHA256 f4a78ced1e27fbf69704e9ec7731c57f282563ad9dccf1f7e01ffed34697f627
-DIST LVM2.2.02.39.tgz 578005 RMD160 8a6c0ce5d13e7e215a346bcfa3f2427803ab0a9d SHA1 0bc8a2c351f0ca0123e592bc3e808e39b0d03bbb SHA256 d07bbdda39307bd01e9a41eb50e265c72baed026abb6d4a4c452ba24e9f1cea2
-EBUILD clvm-2.02.39.ebuild 3640 RMD160 99e986dae62b76452d35fb712463d02d3c866039 SHA1 08b00291b3b0fa988d72236c9f7f2a20a543550d SHA256 c9ef2c432390a4d06a90a81c51e41e9d373131e22802a6dde16f168c3f0ea13d
-EBUILD clvm-2.02.45.ebuild 654 RMD160 af8b65fe02273f53574dd0a8a2860470c9cbb5c5 SHA1 0ba0a9a9756df1f97251bf68645ba29290f3c3f7 SHA256 80ad39906419029f208037c513592dca5b7e8052e5f3815ac28f924bbcbb9990
-MISC ChangeLog 5196 RMD160 d2145578031d9d3e31bd0ddae407d91b8710ad69 SHA1 6c01c3de2e0c0ec34e4d29e0983ae20be6e37ba2 SHA256 789809340508da85f06077f8b426b05993ea37a682d258ab339a1189cef645b4
-MISC metadata.xml 242 RMD160 bdee469b95fdc095ed18e6620d86fea03f57194d SHA1 36aca1c80fee8d2f302ef9d9e6422cd39f100b7d SHA256 b9e9b228fd97e685c563a2ab1e5fc9ed5524fb6b36e909229f76629a7229865e
diff --git a/sys-fs/clvm/clvm-2.02.39.ebuild b/sys-fs/clvm/clvm-2.02.39.ebuild
deleted file mode 100644
index 068bd72c3945..000000000000
--- a/sys-fs/clvm/clvm-2.02.39.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/clvm-2.02.39.ebuild,v 1.3 2008/11/22 01:16:59 xmerlin Exp $
-
-inherit eutils multilib
-
-MY_P="${PN/clvm/LVM2}.${PV}"
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
-HOMEPAGE="http://sources.redhat.com/lvm2/"
-SRC_URI="ftp://sources.redhat.com/pub/lvm2/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="readline static selinux"
-
-DEPEND=">=sys-fs/device-mapper-1.02.27
-	=sys-cluster/dlm-2*
-	=sys-cluster/cman-2*
-	"
-
-RDEPEND="${DEPEND}
-	!sys-fs/lvm-user
-	!sys-fs/lvm2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/lvm.conf-2.02.33.patch || die
-	#epatch "${FILESDIR}"/cluster-locking-built-in.patch || die
-}
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-	local buildmode
-
-	# fsadm is broken, don't include it (2.02.28)
-	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	if use static ; then
-		einfo "Building static LVM, for usage inside genkernel"
-		myconf="${myconf} --enable-static_link"
-		buildmode="internal"
-	else
-		ewarn "Building shared LVM, it will not work inside genkernel!"
-		buildmode="shared"
-	fi
-
-	# dmeventd requires mirrors to be internal, and snapshot available
-	# so we cannot disable them
-	myconf="${myconf} --with-mirrors=internal"
-	myconf="${myconf} --with-snapshots=internal"
-
-	if use lvm1 ; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	myconf="${myconf} --with-cluster=${buildmode}"
-	# 4-state!
-	myconf="${myconf} --with-clvmd=cman"
-	myconf="${myconf} --with-pool=${buildmode}"
-
-	myconf="${myconf} --sbindir=/sbin --with-staticdir=/sbin"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# TODO: At some point in the future, we need to stop installing the static
-	# as the /sbin/lvm name, and have both variants seperate.
-	if use static; then
-		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
-			|| die "Failed to copy lvm.static"
-	fi
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /lib/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh lvm-stop.sh || die
-
-	newinitd "${FILESDIR}"/lvm.rc lvm || die
-	newconfd "${FILESDIR}"/lvm.confd lvm || die
-
-	newinitd "${FILESDIR}"/clvmd.rc clvmd || die
-	newconfd "${FILESDIR}"/clvmd.confd clvmd || die
-
-	elog ""
-	elog "Rebuild your genkernel initramfs if you are using lvm"
-	use nolvmstatic && \
-		elog "USE=nolvmstatic has changed to USE=static via package.use"
-}
-
-pkg_postinst() {
-	elog "lvm volumes are no longer automatically created for"
-	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
-	elog "run: # rc-update add lvm boot"
-}
diff --git a/sys-fs/clvm/clvm-2.02.45.ebuild b/sys-fs/clvm/clvm-2.02.45.ebuild
deleted file mode 100644
index 561d1de7e003..000000000000
--- a/sys-fs/clvm/clvm-2.02.45.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/clvm-2.02.45.ebuild,v 1.1 2009/07/22 01:02:25 robbat2 Exp $
-
-EAPI=2
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
-HOMEPAGE="http://sources.redhat.com/lvm2/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-fs/lvm2-2.02.45[clvm]"
-
-clvm_warning() {
-	elog "clvm has been merged with the main lvm2 package."
-	elog "please remove any explicit references to sys-fs/clvm."
-}
-
-pkg_setup() {
-	clvm_warning
-}
-pkg_postinst() {
-	clvm_warning
-}
diff --git a/sys-fs/clvm/files/clvmd.confd b/sys-fs/clvm/files/clvmd.confd
deleted file mode 100644
index 57821709f5f8..000000000000
--- a/sys-fs/clvm/files/clvmd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# CLVMD_CLUSTER_TIMEOUT -- amount of time to wait for cluster quorum.
-
-CLVMD_CLUSTER_TIMEOUT=30
-
-
-# CLVMD_NODES_TIMEOUT -- amount of time to wait for the other nodes to
-# join the cluster.
-
-CLVMD_NODES_TIMEOUT=60
diff --git a/sys-fs/clvm/files/clvmd.rc b/sys-fs/clvm/files/clvmd.rc
deleted file mode 100755
index 69d5a7f5331d..000000000000
--- a/sys-fs/clvm/files/clvmd.rc
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/clvmd.rc,v 1.6 2008/11/22 01:16:59 xmerlin Exp $
-
-[ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd"
-
-[ -z "$CLVMD_CLUSTER_TIMEOUT" ] && CLVMD_CLUSTER_TIMEOUT=30
-[ -n "$CLVMD_NODES_TIMEOUT" ] || CLVMD_NODES_TIMEOUT=60
-
-VGCHANGE="/sbin/vgchange"
-VGSCAN="/sbin/vgscan"
-VGDISPLAY="/sbin/vgdisplay"
-CLVMD_PIDFILE="/var/run/clvmd.pid"
-
-depend() {
-	use dns logger
-	use net
-	need cman
-}
-
-load_modules() {
-	local module modules
-	modules=$1
-	
-	for module in ${modules}; do
-		ebegin "Loading ${module} kernel module"
-		modprobe ${module}
-		eend $? "Failed to load ${module} kernel module"
-	done
-}
-
-unload_modules() {
-	local module modules
-	modules=$1
-	
-	for module in ${modules}; do
-		ebegin "Unloading ${module} kernel module"
-		modprobe -r ${module}
-		eend $? "Failed to unload ${module} kernel module"
-	done
-}
-
-umount_gfs_filesystems() {
-	local sig retry
-	local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
-
-	if [ -n "${remaining}" ]
-	then
-	        sig=
-	        retry=3
-	        while [ -n "${remaining}" -a "${retry}" -gt 0 ]
-	        do
-	                if [ "${retry}" -lt 3 ]
-			then
-	                        ebegin "Unmounting GFS filesystems (retry)"
-	                        umount ${remaining} &>/dev/null
-	                        eend $? "Failed to unmount GFS filesystems this retry"
-	                else
-	                        ebegin "Unmounting GFS filesystems"
-	                        umount ${remaining} &>/dev/null
-	                        eend $? "Failed to unmount GFS filesystems"
-	                fi
-	                remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
-	                [ -z "${remaining}" ] && break
-	                /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
-	                sleep 5
-	                retry=$((${retry} -1))
-	                sig=-9
-	        done
-	fi
-}
-
-
-start_volumes() {
-	ebegin "Scanning LVM volumes"
-	$VGSCAN > /dev/null 2>&1
-	eend $?
-
-	ret=$?
-	if [ "$ret" -eq 5 ]
-	then
-		einfo "  Waiting for other nodes to join the cluster ($CLVMD_NODES_TIMEOUT seconds)"
-	fi
-
-	clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
-	for vg in $clustervgs; do
-		ebegin "  Activating Clustered VG: ${vg} "
-
-		wait=0
-		while [ -n "$($VGCHANGE -a y ${vg} 2>&1 |grep "clvmd not running")" ]; do
-			if [ $wait -lt $CLVMD_NODES_TIMEOUT ]; then
-				sleep 3
-				wait=$(($wait + 3))
-			else
-				eend 1
-			fi
-		done
-		eend 0
-	done
-}
-
-stop_volumes() {
-	# Deactivate only clustered volumes
-	clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
-	for vg in $clustervgs; do
-		ebegin "  Shutting Down Clustered VG: ${vg} "
-		$VGCHANGE -anl ${vg} >/dev/null
-		eend $?
-	done
-}
-
-
-start() {
-	local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/{modules,devices})
-
-	if [ -z "${module}" ]; then
-		load_modules "dm-mod"
-		sleep 1s
-	fi
-
-	ebegin "Starting clvmd ($CLVMD_CLUSTER_TIMEOUT seconds)"
-
-	start-stop-daemon --start --quiet --exec ${CLVMD_BIN} -- -T ${CLVMD_CLUSTER_TIMEOUT}
-	eend $?
-
-	start_volumes
-}
-
-stop() {
-
-	# umount GFS filesystems
-	umount_gfs_filesystems
-
-	#stop_volumes
-
-	ebegin "Stopping clvmd"
-	#start-stop-daemon --stop -s TERM --quiet --exec ${CLVMD_BIN} --name clvmd
-	killall -TERM ${CLVMD_BIN} >/dev/null
-	eend $?
-
-        #local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/modules)
-
-	#if [[ "$?" -eq 0 && ! -z "${module}" ]]; then
-        #        unload_modules "dm-mod"
-        #fi
-}
diff --git a/sys-fs/clvm/files/lvm.conf-2.02.33.patch b/sys-fs/clvm/files/lvm.conf-2.02.33.patch
deleted file mode 100644
index dd80f8b0fbb8..000000000000
--- a/sys-fs/clvm/files/lvm.conf-2.02.33.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.33.orig/doc/example.conf LVM2.2.02.33/doc/example.conf
---- LVM2.2.02.33.orig/doc/example.conf	2008-01-09 07:32:19.000000000 -0800
-+++ LVM2.2.02.33/doc/example.conf	2008-02-06 17:39:20.439958042 -0800
-@@ -49,7 +49,9 @@
- 
- 
-     # By default we accept every block device:
--    filter = [ "a/.*/" ]
-+    # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
-+    # noise when you probed while not available.
-+    filter = [ "r|/dev/nbd.*|", "a/.*/" ]
- 
-     # Exclude the cdrom drive
-     # filter = [ "r|/dev/cdrom|" ]
-@@ -85,7 +87,7 @@
-     # If sysfs is mounted (2.6 kernels) restrict device scanning to 
-     # the block devices it believes are valid.
-     # 1 enables; 0 disables.
--    sysfs_scan = 1	
-+    sysfs_scan = 1
- 
-     # By default, LVM2 will ignore devices used as components of
-     # software RAID (md) devices by looking for md superblocks.
-@@ -218,12 +220,14 @@
-     # e.g. vgscan.lvm1 and they will stop working after you start using
-     # the new lvm2 on-disk metadata format.
-     # The default value is set when the tools are built.
--    # fallback_to_lvm1 = 0
-+    # Gentoo: the LVM tools are a seperate package.
-+    fallback_to_lvm1 = 0
- 
-     # The default metadata format that commands should use - "lvm1" or "lvm2".
-     # The command line override is -M1 or -M2.
-     # Defaults to "lvm1" if compiled in, else "lvm2".
--    # format = "lvm1"
-+    # Gentoo: default to LVM2 format
-+    format = "lvm2"
- 
-     # Location of proc filesystem
-     proc = "/proc"
-@@ -350,12 +354,12 @@
- 
- # Metadata settings
- #
--# metadata {
-+metadata {
-     # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
-     # You might want to override it from the command line with 0 
-     # when running pvcreate on new PVs which are to be added to large VGs.
--
--    # pvmetadatacopies = 1
-+    # Gentoo: enabled for data safety
-+    pvmetadatacopies = 2
- 
-     # Approximate default size of on-disk metadata areas in sectors.
-     # You should increase this if you have large volume groups or
-@@ -377,11 +381,11 @@
-     # the supplied toolset to make changes (e.g. vgcfgrestore).
- 
-     # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
--#}
-+}
- 
- # Event daemon
--#
--# dmeventd {
-+# Gentoo: uncommented, since we provide the dmeventd init script
-+dmeventd {
-     # mirror_library is the library used when monitoring a mirror device.
-     #
-     # "libdevmapper-event-lvm2mirror.so" attempts to recover from
-@@ -389,7 +393,7 @@
-     # reconfigures a mirror as necessary. If no mirror library is
-     # provided, mirrors are not monitored through dmeventd.
- 
--    # mirror_library = "libdevmapper-event-lvm2mirror.so"
-+    mirror_library = "libdevmapper-event-lvm2mirror.so"
- 
-     # snapshot_library is the library used when monitoring a snapshot device.
-     #
-@@ -398,6 +402,6 @@
-     # snapshot exceedes 80%. The warning is repeated when 85%, 90% and
-     # 95% of the snapshot are filled.
- 
--    # snapshot_library = "libdevmapper-event-lvm2snapshot.so"
--#}
-+    snapshot_library = "libdevmapper-event-lvm2snapshot.so"
-+}
- 
diff --git a/sys-fs/clvm/files/lvm.confd b/sys-fs/clvm/files/lvm.confd
deleted file mode 100644
index 2fbd8668c376..000000000000
--- a/sys-fs/clvm/files/lvm.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# LVM should normally only be started after mdraid is available
-# this is because LVM physical volumes are very often MD devices.
-RC_AFTER="mdraid"
-
-# vim: ft=gentoo-conf-d
diff --git a/sys-fs/clvm/files/lvm.rc b/sys-fs/clvm/files/lvm.rc
deleted file mode 100644
index bef24adb32f9..000000000000
--- a/sys-fs/clvm/files/lvm.rc
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm.rc,v 1.1 2008/11/21 23:31:44 xmerlin Exp $
-
-depend() {
-	if [ -e /lib/librc.so ]; then
-		# on baselayout-1 this causes
-		# dependency-cycles with checkroot (before *)
-		before checkfs fsck
-		after modules
-	fi
-}
-
-start() {
-	if [ ! -e /lib/librc.so ]; then
-		eerror "The $SVCNAME init-script is written for baselayout-2!"
-		eerror "Please do not use it with baselayout-1!".
-		return 1
-	fi
-
-	start_addon lvm
-}
-
-stop() {
-	stop_addon lvm
-}
-
-# vim:ts=4
diff --git a/sys-fs/clvm/files/lvm2-start.sh b/sys-fs/clvm/files/lvm2-start.sh
deleted file mode 100755
index 27ef40f26702..000000000000
--- a/sys-fs/clvm/files/lvm2-start.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-# /lib/rcscripts/addons/lvm2-start.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm2-start.sh,v 1.4 2008/11/21 23:31:44 xmerlin Exp $
-
-# LVM support for /usr, /home, /opt ....
-# This should be done *before* checking local
-# volumes, or they never get checked.
-			        
-# NOTE: Add needed modules for LVM or RAID, etc
-#       to /etc/modules.autoload if needed
-if [[ -z ${CDBOOT} ]] && [[ -x /sbin/vgscan ]] ; then
-	if [[ -e /proc/modules ]] && \
-	   ! grep -qs 'device-mapper' /proc/{devices,misc}
-	then
-		modprobe dm-mod &>/dev/null
-	fi
-
-	if [[ -d /proc/lvm ]] || grep -qs 'device-mapper' /proc/{devices,misc} ; then
-		ebegin "Setting up the Logical Volume Manager"
-		#still echo stderr for debugging
-		/sbin/vgscan --mknodes --ignorelockingfailure >/dev/null
-		if [[ $? == 0 ]] && [[ -x /sbin/vgchange ]] && \
-		   [[ -f /etc/lvmtab || -d /etc/lvm ]]
-		then
-			noclustervgs=`/sbin/vgdisplay 2> /dev/null | \
-				awk 'BEGIN {RS="VG Name"} {if (!/Clustered/) { if ($1 != "---") print $1; } }'`
-			for vg in $noclustervgs; do
-				/sbin/vgchange --ignorelockingfailure -a y ${vg} >/dev/null
-			done
-		fi
-		eend $? "Failed to setup the LVM"
-	fi
-fi
-
-# vim:ts=4
diff --git a/sys-fs/clvm/files/lvm2-stop.sh b/sys-fs/clvm/files/lvm2-stop.sh
deleted file mode 100755
index c7f979c1d3a1..000000000000
--- a/sys-fs/clvm/files/lvm2-stop.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-# /lib/rcscripts/addons/lvm2-stop.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm2-stop.sh,v 1.4 2008/11/21 23:31:44 xmerlin Exp $
-
-# Stop LVM2
-if [ -x /sbin/vgchange ] && \
-   [ -x /sbin/lvdisplay ] && \
-   [ -x /sbin/vgdisplay ] && \
-   [ -x /sbin/lvchange ] && \
-   [ -f /etc/lvmtab -o -d /etc/lvm ] && \
-   [ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
-then
-	einfo "Shutting down the Logical Volume Manager"
-	# If these commands fail it is not currently an issue
-	# as the system is going down anyway based on the current LVM 
-	# functionality as described in this forum thread
-	#https://www.redhat.com/archives/linux-lvm/2001-May/msg00523.html
-
-	LOGICAL_VOLUMES=`lvdisplay |grep "LV Name"|sed -e 's/.*LV Name\s*\(.*\)/\1/'|sort`
-	VOLUME_GROUPS=`vgdisplay |grep "VG Name"|sed -e 's/.*VG Name\s*\(.*\)/\1/'|sort`
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
-		if [ "${LV_IS_ACTIVE}" = 0 ]
-		then
-			ebegin "  Shutting Down logical volume: ${x} "
-			lvchange -an --ignorelockingfailure -P ${x} >/dev/null
-			eend $?
-		fi
-	done
-
-	for x in ${VOLUME_GROUPS}
-	do
-		VG_HAS_ACTIVE_LV=`vgdisplay ${x}|grep "Open LV"|sed -e 's/.*Open LV\s*\(.*\)/\1/'`
-		if [ "${VG_HAS_ACTIVE_LV}" = 0 ]
-		then
-			ebegin "  Shutting Down volume group: ${x} "
-			vgchange -an --ignorelockingfailure -P ${x} >/dev/null
-			eend
-		fi
-	done
-
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|sed -e 's/.*# open\s*\(.*\)/\1/'`
-		if [ "${LV_IS_ACTIVE}" = 1 ]
-		then
-			
-			ROOT_DEVICE=`mount|grep " / "|awk '{print $1}'`
-			MOUNTED_DEVICE=${x}
-			[ -L ${ROOT_DEVICE} ] && ROOT_DEVICE="`/bin/readlink ${ROOT_DEVICE}`"
-			[ -L ${x} ] && MOUNTED_DEVICE="`/bin/readlink ${x}`"
-			if [ ! ${ROOT_DEVICE} = ${MOUNTED_DEVICE} ]
-			then
-				ewarn "  Unable to shutdown: ${x} "
-			fi
-		fi
-	done
-	einfo "Finished Shutting down the Logical Volume Manager"
-fi
-
-# vim:ts=4
diff --git a/sys-fs/clvm/metadata.xml b/sys-fs/clvm/metadata.xml
deleted file mode 100644
index cc30b8b502af..000000000000
--- a/sys-fs/clvm/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>ha-cluster</herd>
-<maintainer>
-  <email>ha-cluster@gentoo.org</email>
-</maintainer>
-<use>
-</use>
-</pkgmetadata>
diff --git a/sys-fs/gfs/ChangeLog b/sys-fs/gfs/ChangeLog
deleted file mode 100644
index d2cc7db4ed8f..000000000000
--- a/sys-fs/gfs/ChangeLog
+++ /dev/null
@@ -1,160 +0,0 @@
-# ChangeLog for sys-fs/gfs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.36 2009/02/10 22:54:33 xmerlin Exp $
-
-  10 Feb 2009; Christian Zoffoli <xmerlin@gentoo.org> gfs-2.03.09.ebuild:
-  Stable on x86 and amd64.
-
-  21 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> gfs-2.03.09.ebuild:
-  Fixed homepage.
-
-*gfs-2.03.09 (13 Nov 2008)
-
-  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> -files/gfs-1.0x.rc,
-  -gfs-1.02.00-r1.ebuild, -gfs-1.03.00.ebuild, -gfs-1.04.00.ebuild,
-  -gfs-2.02.00.ebuild, -gfs-2.02.00-r1.ebuild, +gfs-2.03.09.ebuild:
-  Ebuild cleanup, version bump.
-
-*gfs-2.02.00-r1 (23 Mar 2008)
-
-  23 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
-  +gfs-2.02.00-r1.ebuild:
-  Updated 2.02.00 to STABLE2 20080323.
-
-  21 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> files/gfs-2.0x.rc:
-  Removed gulm from the init script, now it's deprecated.
-
-  17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> files/gfs-2.0x.rc:
-  Fixed bug #209267, now gfs init script honours options in fstab.
-
-*gfs-2.02.00 (17 Mar 2008)
-
-  17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> +files/gfs-1.0x.rc,
-  +files/gfs-2.0x.rc, -files/gfs.rc, gfs-1.02.00-r1.ebuild,
-  gfs-1.03.00.ebuild, gfs-1.04.00.ebuild, +gfs-2.02.00.ebuild:
-  Version bump. 1.0x.00 is scheduled to be removed soon.
-
-  12 May 2007; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.03.00.ebuild:
-  Stable on x86.
-
-  26 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
-  Update for cluster herd split to hp-cluster and ha-cluster.
-
-*gfs-1.04.00 (09 Mar 2007)
-
-  09 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.02.00-r1.ebuild,
-  gfs-1.03.00.ebuild, +gfs-1.04.00.ebuild:
-  Version bump, relaxed dependencies.
-
-  15 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.02.00-r1.ebuild,
-  gfs-1.03.00.ebuild:
-  Removed unneeded eclasses.
-
-  14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org> -gfs-1.01.00.ebuild,
-  -gfs-1.02.00.ebuild, gfs-1.02.00-r1.ebuild, gfs-1.03.00.ebuild:
-  Ebuild cleanup. Added some compile/install checks.
-
-*gfs-1.03.00 (30 Aug 2006)
-
-  30 Aug 2006; Christian Zoffoli <xmerlin@gentoo.org> +gfs-1.03.00.ebuild:
-  Version bump.
-
-  24 Aug 2006; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.02.00-r1.ebuild:
-  Stable x86.
-
-  15 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.02.00.ebuild,
-  gfs-1.02.00-r1.ebuild:
-  Added /etc/cluster creation.
-
-*gfs-1.02.00-r1 (13 Jul 2006)
-
-  13 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.02.00.ebuild,
-  +gfs-1.02.00-r1.ebuild:
-  1.02.00 updated to current stable.
-
-  13 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org>
-  -gfs-1.00.00-r1.ebuild:
-  Ebuild cleanup.
-
-  02 May 2006; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.01.00.ebuild:
-  1.01.00 re-marked stable on x86
-
-  02 May 2006; Mark Loeser <halcy0n@gentoo.org> gfs-1.01.00.ebuild:
-  Back to ~x86 until the deps are marked stable as well
-
-*gfs-1.02.00 (30 Apr 2006)
-
-  30 Apr 2006; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.01.00.ebuild,
-  +gfs-1.02.00.ebuild:
-  Version bump.
-
-  30 Apr 2006; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.01.00.ebuild:
-  Stable x86.
-
-  08 Oct 2005; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.00.00-r1.ebuild:
-  ebuild cleanup. New version.
-
-  05 Sep 2005; Danny van Dyk <kugelfang@gentoo.org> gfs-1.00.00-r1.ebuild:
-  Marked ~amd64.
-
-  05 Sep 2005; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.00.00-r1.ebuild:
-  improved dep.
-
-*gfs-1.00.00-r1 (05 Sep 2005)
-
-  05 Sep 2005; Christian Zoffoli <xmerlin@gentoo.org> +gfs-1.00.00-r1.ebuild,
-  -gfs-1.00.00.ebuild:
-  changed headers dep.
-
-  01 Jul 2005; David Holm <dholm@gentoo.org> gfs-1.00.00.ebuild:
-  Added to ~ppc.
-
-*gfs-1.00.00 (30 Jun 2005)
-
-  30 Jun 2005; Christian Zoffoli <xmerlin@gentoo.org> +gfs-1.00.00.ebuild,
-  -gfs-6.1_pre21.ebuild:
-  1.00.00 tree in portage. Removed old ebuilds.
-
-  14 Jun 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs.rc:
-  fixed gfs mounting. Closed bug #93903.
-
-  26 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs.rc:
-  fixed regexp in init
-
-  25 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs.rc,
-  gfs-6.1_pre21.ebuild:
-  added dynamic need in init script
-
-  25 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs.rc:
-  improved init script
-
-  23 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs.rc:
-  added lock_harness module remove in init
-
-  23 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs.rc:
-  fixed a dep in init
-
-  22 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> -files/gfs,
-  -files/gfs-mount, +files/gfs.rc, gfs-6.1_pre21.ebuild:
-  improved init, removed old fiiles/{gfs,gfs-mount}
-
-  19 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs,
-  gfs-6.1_pre21.ebuild:
-  new init
-
-  19 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs,
-  gfs-6.1_pre21.ebuild:
-  fixed some deps, changed fence option
-
-*gfs-6.1_pre3 (19 Mar 2005)
-
-  19 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> +gfs-6.1_pre21.ebuild,
-  -gfs-6.1_pre3.ebuild:
-  gfs added to portage
-
-*gfs-6.1_pre3 (19 Mar 2005)
-
-  28 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org> +metadata.xml,
-  +files/gfs, +files/gfs-mount, +gfs-6.1_pre3.ebuild:
-  new in portage
-
diff --git a/sys-fs/gfs/Manifest b/sys-fs/gfs/Manifest
deleted file mode 100644
index 72f3c1ff2c3a..000000000000
--- a/sys-fs/gfs/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX gfs-2.0x.rc 3959 RMD160 47af3ef7e75fead4164f85da8828ec1fb87d48bb SHA1 fcdc78c4c98d5214c4a0ef8ca9b782d0732094b0 SHA256 b6dd7eaa51728576ffd8125bab892e19881c7853bfcde8325db94d1a41996886
-DIST cluster-2.03.09.tar.gz 1784357 RMD160 9ac5c3fd0fece8ec17bd31d116c43b33612741d0 SHA1 c2cdbc657da2a9efde4b1e6d2657170e1c09b5b8 SHA256 b6d6f35f58b2f8628c369391e0fd01b1803af40029ec1e6ef88865dda38b855f
-EBUILD gfs-2.03.09.ebuild 2091 RMD160 0869749a129562003e664f6db08488782effc548 SHA1 bcf6f70aee7854f9e148bdbeada78b0c9e7270dc SHA256 0cb42000fc13cdb6a20716cd9a2ada03152da44b024b8e5f84c6eb656a26f9f7
-MISC ChangeLog 5248 RMD160 433eb1a9787e67bc62a6f6d9355077aab6f69cbb SHA1 00c6f4467629800d29112c2a29932d50f4e222d8 SHA256 357c4a07434e06fed765ea2d20341b02bf88271bb240ece7b79a4da26daf215c
-MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmSFQgACgkQgMUyd/cdjWuNqwCcCkhbVV1D85y4xsaJEcndFZ2j
-rmUAniOeycjOmEHdTCUuuxDAnm6klsQS
-=aFh6
------END PGP SIGNATURE-----
diff --git a/sys-fs/gfs/files/gfs-2.0x.rc b/sys-fs/gfs/files/gfs-2.0x.rc
deleted file mode 100755
index d1604a2bb972..000000000000
--- a/sys-fs/gfs/files/gfs-2.0x.rc
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs-2.0x.rc,v 1.3 2008/03/21 11:59:52 xmerlin Exp $
-
-opts="${opts} mountall"
-
-depend() {
-	local myneed="cman"
-	local devices="$(awk '!/^#/ && $3 == "gfs" && $4 !~ /noauto/ {print $1 }' /etc/fstab)"
-
-	if [ -n "${devices}" ]; then
-		local device=""
-		for device in ${devices}; do
-			if [ -n "$(echo "${device}" | awk '$1 ~ /\/dev\/gnbd/')" ]; then
-				myneed="${myneed} gnbd-client"
-			else
-				if [ -n "$(echo "${device}" | awk '$1 ~ /\/dev\/vg/')" ]; then
-					myneed="${myneed} clvmd"
-				fi
-			fi
-		done
-	fi
-
-	use dns logger net
-	need ${myneed}
-}
-
-mount_gfs_filesystems() {
-	local remaining=""
-	remaining="$(awk '!/^#/ && $3 == "gfs"  { if ($4 !~ "noauto") print $1 }' /etc/fstab)"
-	
-	if [ -n "${remaining}" ]; then
-	
-		local device=""
-		local remaining_verified=""
-		
-		for device in ${remaining}; do
-			if [ -b ${device} ]; then
-				remaining_verified="${remaining_verified} ${device}"
-			else
-				ewarn "Block device ${device} not found!!"
-			fi
-		done
-		
-		if [ -n "${remaining_verified}" ]; then
-			einfo "Mounting GFS filesystems"
-			device=""
-			for device in ${remaining_verified}; do
-				local target="$(awk '!/^#/ && $3 == "gfs" && $1 == device { print $2 }' device=${device} /etc/fstab)"
-				local mounted="$(awk '$3 == "gfs" && $1 == device { print $2 }' device=${device} /proc/mounts)"
-				local options="$(awk '!/^#/ && $3 == "gfs" && $1 == device { print $4 }' device=${device} /etc/fstab)"
-				
-				# mount only filesystems not already mounted
-				if [ -z "${mounted}" ]; then
-					ebegin "--> mounting ${device} on ${target}"
-					mount -t gfs ${device} ${target} -o ${options} >/dev/null
-					eend $?
-				else
-					einfo "--> ${device} already mounted on ${target}"
-					eend 0
-				fi
-			done
-		else
-			einfo "No GFS filesystems to automount"
-		fi
-	fi
-}
-
-
-umount_gfs_filesystems() {
-	local sig retry
-	local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
-
-	if [ -n "${remaining}" ]
-	then
-	        sig=
-	        retry=3
-	        while [ -n "${remaining}" -a "${retry}" -gt 0 ]
-	        do
-	                if [ "${retry}" -lt 3 ]
-			then
-	                        ebegin "Unmounting GFS filesystems (retry)"
-	                        umount ${remaining} &>/dev/null
-	                        eend $? "Failed to unmount GFS filesystems this retry"
-	                else
-	                        ebegin "Unmounting GFS filesystems"
-	                        umount ${remaining} &>/dev/null
-	                        eend $? "Failed to unmount GFS filesystems"
-	                fi
-	                remaining="$(awk '$3 == "gfs" { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
-	                [ -z "${remaining}" ] && break
-	                /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
-	                sleep 5
-	                retry=$((${retry} -1))
-	                sig=-9
-	        done
-	fi
-}
-
-load_modules() {
-	local module modules
-	modules=$1
-	
-	for module in ${modules}; do
-		ebegin "Loading ${module} kernel module"
-		modprobe ${module}
-		eend $? "Failed to load ${module} kernel module"
-	done
-}
-
-unload_modules() {
-	local module modules
-	modules=$1
-	
-	for module in ${modules}; do
-		ebegin "Unloading ${module} kernel module"
-		modprobe -r ${module}
-		eend $? "Failed to unload ${module} kernel module"
-	done
-}
-
-load_gfs_modules() {
-	if [ ! -f /proc/fs/gfs ]; then
-		load_modules gfs
-	fi
-}
-
-unload_gfs_modules() {
-	if [ -f /proc/fs/gfs ]; then
-		unload_modules gfs
-	fi
-}
-
-mountall() {
-	mount_gfs_filesystems
-}
-
-start() {
-	einfo "Starting gfs cluster:"
-	
-	if [ ! -f /etc/ntp.conf ] ; then
-		eerror "Please create /etc/ntp.conf"
-		eerror "Sample conf: /usr/share/ntp/ntp.conf"
-		eend 1
-	fi
-	
-	load_gfs_modules
-	mount_gfs_filesystems
-}
-
-stop() {
-	einfo "Stopping gfs cluster:"
-	
-	umount_gfs_filesystems
-	unload_gfs_modules
-}
-
diff --git a/sys-fs/gfs/gfs-2.03.09.ebuild b/sys-fs/gfs/gfs-2.03.09.ebuild
deleted file mode 100644
index d1f3c024c3d5..000000000000
--- a/sys-fs/gfs/gfs-2.03.09.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-2.03.09.ebuild,v 1.3 2009/02/10 22:54:33 xmerlin Exp $
-
-inherit eutils versionator
-
-CVS_RELEASE="20080323"
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
-
-DESCRIPTION="Shared-disk cluster file system"
-HOMEPAGE="http://sources.redhat.com/cluster/wiki"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-#RDEPEND="=sys-cluster/gfs2-${CLUSTER_RELEASE}*"
-RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-${CLUSTER_RELEASE}*
-	=sys-cluster/fence-${CLUSTER_RELEASE}*
-	sys-fs/e2fsprogs"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-	) || die "configure problem"
-
-	# gfs now depeneds on gfs2, due to common mount command.
-	# to avoid a dependency on gfs2, we simply build its mount command twice
-	# and rename it
-	sed -i \
-		-e '/ln -sf [u]\?mount.gfs2 [u]\?mount.gfs/d' \
-		Makefile
-
-	(cd "${WORKDIR}"/${MY_P}/gfs2/mount;
-		emake -j1 \
-	) || die "compile problem"
-
-	# fix -ggdb CFLAGS
-	#sed -i \
-	#	-e '/-ggdb/d' \
-	#	libgfs/Makefile
-
-	# fix the manual pages have executable bit
-	sed -i -e '
-		/\tinstall -d/s/install/& -m 0755/; t
-		/\tinstall/s/install/& -m 0644/' \
-		man/Makefile
-
-	emake -j1 clean all || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	mv "${WORKDIR}"/${MY_P}/gfs2/mount/mount.gfs2 "${D}"/sbin/mount.gfs
-	mv "${WORKDIR}"/${MY_P}/gfs2/mount/umount.gfs2 "${D}"/sbin/umount.gfs
-
-	keepdir /etc/cluster || die
-	newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die
-
-	if use doc ; then
-		dodoc "${WORKDIR}"/${MY_P}/doc/*.txt || die
-	fi
-}
diff --git a/sys-fs/gfs/metadata.xml b/sys-fs/gfs/metadata.xml
deleted file mode 100644
index b2c73e8f3872..000000000000
--- a/sys-fs/gfs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>ha-cluster</herd>
-<maintainer>
-  <email>ha-cluster@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-fs/gfs2/ChangeLog b/sys-fs/gfs2/ChangeLog
deleted file mode 100644
index 9a0a41b38636..000000000000
--- a/sys-fs/gfs2/ChangeLog
+++ /dev/null
@@ -1,25 +0,0 @@
-# ChangeLog for sys-fs/gfs2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs2/ChangeLog,v 1.4 2009/02/10 22:58:09 xmerlin Exp $
-
-  11 Feb 2009; Christian Zoffoli <xmerlin@gentoo.org> gfs2-2.03.09.ebuild:
-  Stable on x86 and amd64.
-
-  15 Jan 2009; Jeroen Roovers <jer@gentoo.org> gfs2-2.03.09.ebuild:
-  Fix HOMEPAGE thanks to Mariusz Kozlowski (bug #255015).
-
-  22 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> gfs2-2.03.09.ebuild:
-  Fixed homepage.
-
-*gfs2-2.03.09 (13 Nov 2008)
-
-  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> +files/gfs2.rc,
-  +metadata.xml, +gfs2-2.03.09.ebuild:
-  Ebuild cleanup, version bump.
-
-*gfs2-2.02.00 (17 Mar 2008)
-
-  17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> +files/gfs2.rc,
-  +metadata.xml, +gfs2-2.02.00.ebuild:
-  Initial import.
-
diff --git a/sys-fs/gfs2/Manifest b/sys-fs/gfs2/Manifest
deleted file mode 100644
index 937ab7df2d14..000000000000
--- a/sys-fs/gfs2/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX gfs2.rc 3979 RMD160 8a5d0228ce2df1e642e039a70ada54c5054abbff SHA1 e5a4aeae7a21de873f2da3f274e0a121308ccad4 SHA256 09267ddb998dea15204262661655a471d17bc9ea0bfd0c5effa4e7d5af29274a
-DIST cluster-2.03.09.tar.gz 1784357 RMD160 9ac5c3fd0fece8ec17bd31d116c43b33612741d0 SHA1 c2cdbc657da2a9efde4b1e6d2657170e1c09b5b8 SHA256 b6d6f35f58b2f8628c369391e0fd01b1803af40029ec1e6ef88865dda38b855f
-EBUILD gfs2-2.03.09.ebuild 1725 RMD160 0ebd4a805973d0f9832660420c2787f75b677c21 SHA1 eaa5ae585bfff81f8bdb254da1440719c92cac99 SHA256 4dea0f38089110a60ee05c6870838e24d3da86a39edfbce1f074a594ec3acb37
-MISC ChangeLog 848 RMD160 d198872682c9b418a5c46c2d89137e74e4c21b49 SHA1 cf69fe3cf5ee49b904ae50313a51932a04c4efe1 SHA256 9dde4ce24cc91ce9d29e47bfbf72027766af7c5f409925d75cf0bfec2a538217
-MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmSFeAACgkQgMUyd/cdjWv1mACgkk+hlzmQwH4gonWwYhL186S0
-mbgAn1eA22HK7SvHdhG/jmCIPKOy8R+b
-=NSEh
------END PGP SIGNATURE-----
diff --git a/sys-fs/gfs2/files/gfs2.rc b/sys-fs/gfs2/files/gfs2.rc
deleted file mode 100755
index ee52247e4b9e..000000000000
--- a/sys-fs/gfs2/files/gfs2.rc
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs2/files/gfs2.rc,v 1.1 2008/11/13 19:19:30 xmerlin Exp $
-
-opts="${opts} mountall"
-
-depend() {
-	local myneed="cman"
-	local devices="$(awk '!/^#/ && $3 == "gfs2" && $4 !~ /noauto/ {print $1 }' /etc/fstab)"
-
-	if [ -n "${devices}" ]; then
-		local device=""
-		for device in ${devices}; do
-			if [ -n "$(echo "${device}" | awk '$1 ~ /\/dev\/gnbd/')" ]; then
-				myneed="${myneed} gnbd-client"
-			else
-				if [ -n "$(echo "${device}" | awk '$1 ~ /\/dev\/vg/')" ]; then
-					myneed="${myneed} clvmd"
-				fi
-			fi
-		done
-	fi
-
-	use dns logger net
-	need ${myneed}
-}
-
-mount_gfs2_filesystems() {
-	local remaining=""
-	remaining="$(awk '!/^#/ && $3 == "gfs2"  { if ($4 !~ "noauto") print $1 }' /etc/fstab)"
-	
-	if [ -n "${remaining}" ]; then
-	
-		local device=""
-		local remaining_verified=""
-		
-		for device in ${remaining}; do
-			if [ -b ${device} ]; then
-				remaining_verified="${remaining_verified} ${device}"
-			else
-				ewarn "Block device ${device} not found!!"
-			fi
-		done
-		
-		if [ -n "${remaining_verified}" ]; then
-			einfo "Mounting GFS filesystems"
-			device=""
-			for device in ${remaining_verified}; do
-				local target="$(awk '!/^#/ && $3 == "gfs2" && $1 == device { print $2 }' device=${device} /etc/fstab)"
-				local mounted="$(awk '$3 == "gfs2" && $1 == device { print $2 }' device=${device} /proc/mounts)"
-				local options="$(awk '!/^#/ && $3 == "gfs2" && $1 == device { print $4 }' device=${device} /etc/fstab)"
-				
-				# mount only filesystems not already mounted
-				if [ -z "${mounted}" ]; then
-					ebegin "--> mounting ${device} on ${target}"
-					mount -t gfs2 ${device} ${target} -o ${options} >/dev/null
-					eend $?
-				else
-					einfo "--> ${device} already mounted on ${target}"
-					eend 0
-				fi
-			done
-		else
-			einfo "No GFS filesystems to automount"
-		fi
-	fi
-}
-
-
-umount_gfs2_filesystems() {
-	local sig retry
-	local remaining="$(awk '$3 == "gfs2" { print $2 }' /proc/mounts | sort -r)"
-
-	if [ -n "${remaining}" ]
-	then
-	        sig=
-	        retry=3
-	        while [ -n "${remaining}" -a "${retry}" -gt 0 ]
-	        do
-	                if [ "${retry}" -lt 3 ]
-			then
-	                        ebegin "Unmounting GFS filesystems (retry)"
-	                        umount ${remaining} &>/dev/null
-	                        eend $? "Failed to unmount GFS filesystems this retry"
-	                else
-	                        ebegin "Unmounting GFS filesystems"
-	                        umount ${remaining} &>/dev/null
-	                        eend $? "Failed to unmount GFS filesystems"
-	                fi
-	                remaining="$(awk '$3 == "gfs2" { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
-	                [ -z "${remaining}" ] && break
-	                /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
-	                sleep 5
-	                retry=$((${retry} -1))
-	                sig=-9
-	        done
-	fi
-}
-
-load_modules() {
-	local module modules
-	modules=$1
-	
-	for module in ${modules}; do
-		ebegin "Loading ${module} kernel module"
-		modprobe ${module}
-		eend $? "Failed to load ${module} kernel module"
-	done
-}
-
-unload_modules() {
-	local module modules
-	modules=$1
-	
-	for module in ${modules}; do
-		ebegin "Unloading ${module} kernel module"
-		modprobe -r ${module}
-		eend $? "Failed to unload ${module} kernel module"
-	done
-}
-
-load_gfs2_modules() {
-	if [ ! -f /proc/fs/gfs2 ]; then
-		load_modules gfs2
-	fi
-}
-
-unload_gfs2_modules() {
-	if [ -f /proc/fs/gfs2 ]; then
-		unload_modules gfs2
-	fi
-}
-
-mountall() {
-	mount_gfs2_filesystems
-}
-
-start() {
-	einfo "Starting gfs2 cluster:"
-	
-	if [ ! -f /etc/ntp.conf ] ; then
-		eerror "Please create /etc/ntp.conf"
-		eerror "Sample conf: /usr/share/ntp/ntp.conf"
-		eend 1
-	fi
-	
-	load_gfs2_modules
-	mount_gfs2_filesystems
-}
-
-stop() {
-	einfo "Stopping gfs2 cluster:"
-	
-	umount_gfs2_filesystems
-	unload_gfs2_modules
-}
-
diff --git a/sys-fs/gfs2/gfs2-2.03.09.ebuild b/sys-fs/gfs2/gfs2-2.03.09.ebuild
deleted file mode 100644
index d74e5d3c4005..000000000000
--- a/sys-fs/gfs2/gfs2-2.03.09.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs2/gfs2-2.03.09.ebuild,v 1.5 2009/02/10 22:58:09 xmerlin Exp $
-
-inherit eutils versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
-
-DESCRIPTION="Shared-disk cluster file system"
-HOMEPAGE="http://sources.redhat.com/cluster/wiki"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-${CLUSTER_RELEASE}*
-	=sys-cluster/fence-${CLUSTER_RELEASE}*
-	sys-fs/e2fsprogs"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-	) || die "configure problem"
-
-	# fix symlinks error
-	#sed -i \
-	#	-e '\@\tln -sf ${sbindir}/${TARGET1}@s@${sbindir}/@@' \
-	#	mkfs/Makefile fsck/Makefile
-
-	# fix -ggdb CFLAGS
-	#sed -i \
-	#	-e '/-ggdb/d' \
-	#	edit/Makefile mkfs/Makefile libgfs2/Makefile
-
-	# fix the manual pages have executable bit
-	sed -i -e '
-		/\tinstall -d/s/install/& -m 0755/; t
-		/\tinstall/s/install/& -m 0644/' \
-		man/Makefile
-
-	emake -j1 clean all || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	keepdir /etc/cluster || die
-	newinitd "${FILESDIR}"/${PN}.rc ${PN} || die
-
-	if use doc ; then
-		dodoc "${WORKDIR}"/${MY_P}/doc/*.txt || die
-	fi
-}
diff --git a/sys-fs/gfs2/metadata.xml b/sys-fs/gfs2/metadata.xml
deleted file mode 100644
index b2c73e8f3872..000000000000
--- a/sys-fs/gfs2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>ha-cluster</herd>
-<maintainer>
-  <email>ha-cluster@gentoo.org</email>
-</maintainer>
-</pkgmetadata>