Ebuild cleanup, version bump.

Package-Manager: portage-2.1.4.4

41 files changed, 111 insertions, 1355 deletions

diff --git a/sys-cluster/ccs/ChangeLog b/sys-cluster/ccs/ChangeLog
index 529d566bd3dc..b63182ddd0c2 100644
--- a/sys-cluster/ccs/ChangeLog
+++ b/sys-cluster/ccs/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-cluster/ccs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ChangeLog,v 1.38 2008/03/23 16:07:33 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ChangeLog,v 1.39 2008/11/13 18:58:35 xmerlin Exp $
+
+*ccs-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -ccs-1.02.00-r1.ebuild, -ccs-1.03.00.ebuild, -ccs-1.04.00.ebuild,
+  -ccs-2.02.00.ebuild, -ccs-2.02.00-r1.ebuild, +ccs-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
+
+*ccs-2.03.07 (18 Aug 2008)
+
+  18 Aug 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -ccs-1.02.00-r1.ebuild, -ccs-1.03.00.ebuild, -ccs-1.04.00.ebuild,
+  +ccs-2.03.07.ebuild:
+  Version bump, ebuild cleanup.
 
 *ccs-2.02.00-r1 (23 Mar 2008)
 
diff --git a/sys-cluster/ccs/ccs-1.02.00-r1.ebuild b/sys-cluster/ccs/ccs-1.02.00-r1.ebuild
deleted file mode 100644
index 98497208b733..000000000000
--- a/sys-cluster/ccs/ccs-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-1.02.00-r1.ebuild,v 1.7 2008/03/17 16:31:39 xmerlin Exp $
-
-inherit eutils
-
-CLUSTER_RELEASE="1.02.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-CVS_RELEASE="20060713"
-
-DESCRIPTION="cluster configuration system to manage the cluster config file"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz"
-
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86"
-
-DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
-	dev-libs/libxml2
-	sys-libs/zlib"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${PN}-${PV}-${CVS_RELEASE}-cvs.patch || die
-}
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}d.rc ${PN}d || die
-	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
-}
diff --git a/sys-cluster/ccs/ccs-1.03.00.ebuild b/sys-cluster/ccs/ccs-1.03.00.ebuild
deleted file mode 100644
index 68043dcde005..000000000000
--- a/sys-cluster/ccs/ccs-1.03.00.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-1.03.00.ebuild,v 1.6 2008/03/17 16:31:39 xmerlin Exp $
-
-CLUSTER_RELEASE="1.03.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="cluster configuration system to manage the cluster config file"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86"
-
-DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
-	dev-libs/libxml2
-	sys-libs/zlib"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}d.rc ${PN}d || die
-	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
-}
diff --git a/sys-cluster/ccs/ccs-1.04.00.ebuild b/sys-cluster/ccs/ccs-1.04.00.ebuild
deleted file mode 100644
index 29e4d885179c..000000000000
--- a/sys-cluster/ccs/ccs-1.04.00.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-1.04.00.ebuild,v 1.2 2008/03/17 16:31:39 xmerlin Exp $
-
-CLUSTER_RELEASE="1.04.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="cluster configuration system to manage the cluster config file"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
-	dev-libs/libxml2
-	sys-libs/zlib"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}d.rc ${PN}d || die
-	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
-}
diff --git a/sys-cluster/ccs/ccs-2.02.00-r1.ebuild b/sys-cluster/ccs/ccs-2.02.00-r1.ebuild
deleted file mode 100644
index 4aa1f8505087..000000000000
--- a/sys-cluster/ccs/ccs-2.02.00-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-2.02.00-r1.ebuild,v 1.1 2008/03/23 16:07: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="cluster configuration system to manage the cluster config file"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2
-	http://dev.gentoo.org/~xmerlin/gfs/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=sys-cluster/cman-lib-${CLUSTER_RELEASE}*"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	sys-libs/zlib"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	(cd "${WORKDIR}"/${MY_P};
-		epatch "${WORKDIR}"/gfs-2.02.00-20080323-cvs.patch || die
-	)
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
-	) || die "configure problem"
-
-	# fix the manual pages have executable bit
-	sed -i -e '
-		/\tinstall -d/s/install/& -m 0755/; t
-		/\tinstall/s/install/& -m 0644/' \
-		man/Makefile
-
-	#rm -f "${S}"/lib/log.c || die
-
-	emake clean || die "clean problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-}
diff --git a/sys-cluster/ccs/ccs-2.02.00.ebuild b/sys-cluster/ccs/ccs-2.03.09.ebuild
index 4a023fa33c21..fd159c747eae 100644
--- a/sys-cluster/ccs/ccs-2.02.00.ebuild
+++ b/sys-cluster/ccs/ccs-2.03.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-2.02.00.ebuild,v 1.1 2008/03/17 16:31:39 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-2.03.09.ebuild,v 1.1 2008/11/13 18:58:35 xmerlin Exp $
 
 inherit eutils versionator
 
@@ -26,14 +26,21 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}/${PN}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/ccs-2.03.09-mkostemp.patch || die
+}
+
 src_compile() {
 	(cd "${WORKDIR}"/${MY_P};
 		./configure \
 			--cc=$(tc-getCC) \
 			--cflags="-Wall" \
 			--disable_kernel_check \
-			--release_major="$MAJ_PV" \
-			--release_minor="$MIN_PV" \
+			--somajor="$MAJ_PV" \
+			--sominor="$MIN_PV" \
 			--cmanlibdir=/usr/lib \
 			--cmanincdir=/usr/include \
 	) || die "configure problem"
diff --git a/sys-cluster/ccs/files/ccs-2.03.09-mkostemp.patch b/sys-cluster/ccs/files/ccs-2.03.09-mkostemp.patch
new file mode 100644
index 000000000000..42e2de6ac4ff
--- /dev/null
+++ b/sys-cluster/ccs/files/ccs-2.03.09-mkostemp.patch
@@ -0,0 +1,11 @@
+--- cluster-2.03.09/ccs/ccs_tool/upgrade.c.orig	2008-11-13 01:31:14.000000000 +0100
++++ cluster-2.03.09/ccs/ccs_tool/upgrade.c	2008-11-13 01:31:34.000000000 +0100
+@@ -223,7 +223,7 @@
+   memset(tmp_file, 0, 128);
+   sprintf(tmp_file, "/tmp/ccs_tool_tmp_XXXXXX");
+ 
+-  tmp_fd = mkostemp(tmp_file, O_RDWR | O_CREAT |O_TRUNC);
++  tmp_fd = mkstemp(tmp_file);
+   if(tmp_fd < 0){
+     fprintf(stderr, "Unable to create temporary archive: %s\n", strerror(errno));
+     error = -errno;
diff --git a/sys-cluster/cman-lib/ChangeLog b/sys-cluster/cman-lib/ChangeLog
index 67af45e2bbe3..e817498b3e8c 100644
--- a/sys-cluster/cman-lib/ChangeLog
+++ b/sys-cluster/cman-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/cman-lib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-lib/ChangeLog,v 1.2 2008/03/23 16:14:50 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-lib/ChangeLog,v 1.3 2008/11/13 18:59:51 xmerlin Exp $
+
+*cman-lib-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -cman-lib-2.02.00.ebuild, -cman-lib-2.02.00-r1.ebuild,
+  +cman-lib-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
 
   23 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
   +cman-lib-2.02.00-r1.ebuild:
diff --git a/sys-cluster/cman-lib/cman-lib-2.02.00-r1.ebuild b/sys-cluster/cman-lib/cman-lib-2.02.00-r1.ebuild
deleted file mode 100644
index bf527cf1e606..000000000000
--- a/sys-cluster/cman-lib/cman-lib-2.02.00-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-lib/cman-lib-2.02.00-r1.ebuild,v 1.1 2008/03/23 16:14:50 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="A library for cluster management common to the various pieces of Cluster Suite."
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2
-	http://dev.gentoo.org/~xmerlin/gfs/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="!sys-cluster/cman-headers
-	!sys-cluster/cman-kernel
-	!=sys-cluster/cman-1*
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/${PN/-//}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	(cd "${WORKDIR}"/${MY_P};
-		epatch "${WORKDIR}"/gfs-2.02.00-20080323-cvs.patch || die
-	)
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-	) || die "configure problem"
-
-	emake clean || die "clean problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-}
diff --git a/sys-cluster/cman-lib/cman-lib-2.02.00.ebuild b/sys-cluster/cman-lib/cman-lib-2.03.09.ebuild
index e43251195974..a3b9c16143b8 100644
--- a/sys-cluster/cman-lib/cman-lib-2.02.00.ebuild
+++ b/sys-cluster/cman-lib/cman-lib-2.03.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-lib/cman-lib-2.02.00.ebuild,v 1.1 2008/03/17 16:24:34 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-lib/cman-lib-2.03.09.ebuild,v 1.1 2008/11/13 18:59:51 xmerlin Exp $
 
 inherit eutils versionator
 
@@ -27,21 +27,14 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}/${PN/-//}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-include.patch || die
-}
-
 src_compile() {
 	(cd "${WORKDIR}"/${MY_P};
 		./configure \
 			--cc=$(tc-getCC) \
 			--cflags="-Wall" \
 			--disable_kernel_check \
-			--release_major="$MAJ_PV" \
-			--release_minor="$MIN_PV" \
+			--somajor="$MAJ_PV" \
+			--sominor="$MIN_PV" \
 	) || die "configure problem"
 
 	emake clean || die "clean problem"
diff --git a/sys-cluster/cman/ChangeLog b/sys-cluster/cman/ChangeLog
index 5880b34dd348..9eed9e4ea0a3 100644
--- a/sys-cluster/cman/ChangeLog
+++ b/sys-cluster/cman/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-cluster/cman
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.40 2008/03/23 16:10:53 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.41 2008/11/13 18:56:17 xmerlin Exp $
+
+*cman-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> -files/cman-1.0x.conf,
+  -files/cman-1.0x.rc, -files/qdiskd-1.0x.rc,
+  -files/cman-1.03.00-compile-hack.patch,
+  -files/cman-1.03.00-qdisk-makefile.patch,
+  -files/cman-1.04.00-qdisk-makefile.patch, -cman-1.02.00-r1.ebuild,
+  -cman-1.03.00.ebuild, -cman-1.04.00.ebuild, -cman-2.02.00.ebuild,
+  -cman-2.02.00-r1.ebuild, +cman-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
 
 *cman-2.02.00-r1 (23 Mar 2008)
 
diff --git a/sys-cluster/cman/cman-1.02.00-r1.ebuild b/sys-cluster/cman/cman-1.02.00-r1.ebuild
deleted file mode 100644
index 2f025bc06153..000000000000
--- a/sys-cluster/cman/cman-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.02.00-r1.ebuild,v 1.6 2008/03/17 16:47:10 xmerlin Exp $
-
-inherit eutils
-
-CLUSTER_RELEASE="1.02.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-CVS_RELEASE="20060713"
-
-DESCRIPTION="general-purpose symmetric cluster manager"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86"
-IUSE=""
-
-DEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*"
-
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${PN}-${PV}-${CVS_RELEASE}-cvs.patch || die
-}
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die
-	newconfd "${FILESDIR}"/${PN}-1.0x.conf ${PN} || die
-
-	keepdir /etc/cluster || die
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Please add a cluster.conf in /etc/cluster ."
-	einfo ""
-}
diff --git a/sys-cluster/cman/cman-1.03.00.ebuild b/sys-cluster/cman/cman-1.03.00.ebuild
deleted file mode 100644
index b66b6981f765..000000000000
--- a/sys-cluster/cman/cman-1.03.00.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.03.00.ebuild,v 1.8 2008/03/17 16:47:10 xmerlin Exp $
-
-inherit eutils
-
-CLUSTER_RELEASE="1.03.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="general-purpose symmetric cluster manager"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86"
-IUSE=""
-
-DEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*"
-
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.03.00-compile-hack.patch || die
-	epatch "${FILESDIR}"/${PN}-1.03.00-qdisk-makefile.patch || die
-}
-
-src_compile() {
-	./configure || die "configure problem"
-	emake -j1 || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die
-	newconfd "${FILESDIR}"/${PN}-1.0x.conf ${PN} || die
-
-	newinitd "${FILESDIR}"/qdiskd-1.0x.rc qdiskd || die
-
-	keepdir /etc/cluster || die
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Please add a cluster.conf in /etc/cluster ."
-	einfo ""
-}
diff --git a/sys-cluster/cman/cman-1.04.00.ebuild b/sys-cluster/cman/cman-1.04.00.ebuild
deleted file mode 100644
index c80c92c430be..000000000000
--- a/sys-cluster/cman/cman-1.04.00.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.04.00.ebuild,v 1.6 2008/03/17 16:47:10 xmerlin Exp $
-
-inherit eutils
-
-CLUSTER_RELEASE="1.04.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="general-purpose symmetric cluster manager"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*"
-
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/cman-1.03.00-compile-hack.patch || die
-	epatch "${FILESDIR}"/${P}-qdisk-makefile.patch || die
-}
-
-src_compile() {
-	./configure || die "configure problem"
-	emake -j1 || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die
-	newconfd "${FILESDIR}"/${PN}-1.0x.conf ${PN} || die
-
-	newinitd "${FILESDIR}"/qdiskd-1.0x.rc qdiskd || die
-
-	keepdir /etc/cluster || die
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Please add a cluster.conf in /etc/cluster ."
-	einfo ""
-}
diff --git a/sys-cluster/cman/cman-2.02.00-r1.ebuild b/sys-cluster/cman/cman-2.02.00-r1.ebuild
deleted file mode 100644
index 2b29efebf3d4..000000000000
--- a/sys-cluster/cman/cman-2.02.00-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.02.00-r1.ebuild,v 1.1 2008/03/23 16:10:53 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="general-purpose symmetric cluster manager"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2
-	http://dev.gentoo.org/~xmerlin/gfs/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-kernel/linux-headers-2.6.23
-	=sys-cluster/openais-0.80.3*
-	=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-lib-${CLUSTER_RELEASE}*
-	!sys-cluster/cman-headers
-	!sys-cluster/cman-kernel
-	!sys-cluster/dlm-headers
-	!sys-cluster/magma
-	!sys-cluster/magma-plugins
-	"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND="=sys-cluster/dlm-${CLUSTER_RELEASE}*
-	=sys-cluster/fence-${CLUSTER_RELEASE}*"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix the manual pages have executable bit
-	sed -i -e '
-		/\tinstall -d/s/install/& -m 0755/; t
-		/\tinstall/s/install/& -m 0644/' \
-		man/Makefile || die "failed patching man pages permission"
-
-	(cd "${WORKDIR}"/${MY_P};
-		epatch "${WORKDIR}"/gfs-2.02.00-20080323-cvs.patch || die
-	)
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
-	) || die "configure problem"
-
-	emake clean
-	emake -C cman_tool || die "compile problem"
-	emake -C daemon || die "compile problem"
-	env -u CFLAGS emake -C qdisk || die "compile problem"
-	emake -C init.d || die "compile problem"
-	emake -C man || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	# These were installed by cman-lib.
-	rm "${D}"/usr/lib/libcman.so.${PV} \
-		"${D}"/usr/lib/libcman.a \
-		"${D}"/usr/include/libcman.h \
-		"${D}"/usr/lib/libcman.so.2 \
-		"${D}"/usr/lib/libcman.so \
-		|| die "failed to cleanup extra files"
-
-	newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die
-	newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die
-	newinitd "${FILESDIR}"/qdiskd-2.0x.rc qdiskd || die
-
-	keepdir /etc/cluster || die
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Please add a cluster.conf in /etc/cluster/"
-	einfo ""
-	einfo "If you want to use cman and dlm 2.0x.00"
-	einfo "with 2.6.20 kernels you have to patch your"
-	einfo "kernel sources with:"
-	einfo "http://dev.gentoo.org/~xmerlin/gfs/dlm-gfs-2.6.20.patch.bz2"
-	einfo ""
-}
diff --git a/sys-cluster/cman/cman-2.02.00.ebuild b/sys-cluster/cman/cman-2.03.09.ebuild
index 637ae87e1239..4cca0cfa7565 100644
--- a/sys-cluster/cman/cman-2.02.00.ebuild
+++ b/sys-cluster/cman/cman-2.03.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.02.00.ebuild,v 1.2 2008/03/17 23:39:06 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild,v 1.1 2008/11/13 18:56:17 xmerlin Exp $
 
 inherit eutils versionator
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-kernel/linux-headers-2.6.23
-	=sys-cluster/openais-0.82*
+	=sys-cluster/openais-0.80.3*
 	=sys-cluster/ccs-${CLUSTER_RELEASE}*
 	=sys-cluster/cman-lib-${CLUSTER_RELEASE}*
 	!sys-cluster/cman-headers
@@ -47,7 +47,6 @@ src_unpack() {
 		/\tinstall/s/install/& -m 0644/' \
 		man/Makefile || die "failed patching man pages permission"
 
-	epatch "${FILESDIR}"/${P}-include.patch || die
 }
 
 src_compile() {
@@ -56,8 +55,8 @@ src_compile() {
 			--cc=$(tc-getCC) \
 			--cflags="-Wall" \
 			--disable_kernel_check \
-			--release_major="$MAJ_PV" \
-			--release_minor="$MIN_PV" \
+			--somajor="$MAJ_PV" \
+			--sominor="$MIN_PV" \
 			--cmanlibdir=/usr/lib \
 			--cmanincdir=/usr/include \
 	) || die "configure problem"
@@ -92,7 +91,7 @@ pkg_postinst() {
 	einfo ""
 	einfo "Please add a cluster.conf in /etc/cluster/"
 	einfo ""
-	einfo "If you want to use cman and dlm 2.0x.00"
+	einfo "If you want to use cman and dlm 2.xx.xx"
 	einfo "with 2.6.20 kernels you have to patch your"
 	einfo "kernel sources with:"
 	einfo "http://dev.gentoo.org/~xmerlin/gfs/dlm-gfs-2.6.20.patch.bz2"
diff --git a/sys-cluster/cman/files/cman-1.03.00-compile-hack.patch b/sys-cluster/cman/files/cman-1.03.00-compile-hack.patch
deleted file mode 100644
index 8cae6ddcc8fc..000000000000
--- a/sys-cluster/cman/files/cman-1.03.00-compile-hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cluster-1.03.00/cman/qdisk/Makefile.orig	2006-08-30 15:50:39.000000000 +0200
-+++ cluster-1.03.00/cman/qdisk/Makefile	2006-08-30 15:50:48.000000000 +0200
-@@ -17,7 +17,7 @@
- 
- INCLUDES+=-I. -I../lib
- CFLAGS +=-I${incdir} -I${top_srcdir}/config \
--         -Wall -Werror -Wstrict-prototypes -Wshadow -D_GNU_SOURCE -g
-+         -Wall -Wstrict-prototypes -Wshadow -D_GNU_SOURCE -g
- 
- TARGET=qdiskd mkqdisk
- 
diff --git a/sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch b/sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch
deleted file mode 100644
index e62dd03bf294..000000000000
--- a/sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cluster-1.03.00/cman/qdisk/Makefile.orig	2006-07-21 20:01:38.000000000 +0200
-+++ cluster-1.03.00/cman/qdisk/Makefile	2007-03-13 13:42:14.000000000 +0100
-@@ -32,7 +32,7 @@
- 
- qdiskd: disk.o crc32.o disk_util.o main.o score.o bitmap.o clulog.o \
- 	gettid.o proc.o ../lib/libcman.a
--	gcc -o $@ $^ -lpthread -L../lib -lccs
-+	gcc -o $@ $^ -L$(libdir) -lpthread -L../lib -lccs
- 
- mkqdisk: disk.o crc32.o disk_util.o \
- 	 proc.o mkqdisk.o
diff --git a/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch b/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch
deleted file mode 100644
index fe5dada4a426..000000000000
--- a/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cluster-1.04.00/cman/qdisk/Makefile.orig	2007-05-26 15:23:03.000000000 +0200
-+++ cluster-1.04.00/cman/qdisk/Makefile	2007-05-26 15:23:23.000000000 +0200
-@@ -42,7 +42,7 @@
- 
- qdiskd: disk.o crc32.o disk_util.o main.o score.o bitmap.o clulog.o \
- 	gettid.o proc.o daemon_init.o ../lib/libcman.a
--	gcc -o $@ $^ -lpthread -L../lib -lccs
-+	gcc -o $@ $^ -L$(libdir) -lpthread -L../lib -lccs
- 
- mkqdisk: disk.o crc32.o disk_util.o \
- 	 proc.o mkqdisk.o
diff --git a/sys-cluster/cman/files/cman-1.0x.conf b/sys-cluster/cman/files/cman-1.0x.conf
deleted file mode 100644
index 6d967ccbb5d1..000000000000
--- a/sys-cluster/cman/files/cman-1.0x.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# CMAN_CLUSTER_TIMEOUT -- amount of time to wait for joinging a cluster
-#     before giving up.  If CMAN_CLUSTER_TIMEOUT is positive, then we will
-#     wait CMAN_CLUSTER_TIMEOUT seconds before giving up and failing when
-#     a cluster is not joined.  If CMAN_CLUSTER_TIMEOUT is zero, then
-#     wait indefinately for a cluster join.  If CMAN_CLUSTER_TIMEOUT is
-#     negative, do not check to see that the cluster has been joined
-CMAN_CLUSTER_TIMEOUT=120
-
-# CMAN_QUORUM_TIMEOUT -- amount of time to wait for a quorate cluster on 
-#     startup quorum is needed by many other applications, so we may as 
-#     well wait here.  If CMAN_QUORUM_TIMEOUT is less than 1, quorum will 
-#     be ignored.
-CMAN_QUORUM_TIMEOUT=300
-
-# CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a 
-#     cluster member before calling cman_tool leave during shutdown.  
-#     default is 60 seconds
-CMAN_SHUTDOWN_TIMEOUT=60
-
-# CMAN_JOIN_OPTIONS 
-#CMAN_JOIN_OPTS="-c ...."
-
-# CMAN_LEAVE_OPTIONS
-#CMAN_LEAVE_OPTS=""
diff --git a/sys-cluster/cman/files/cman-1.0x.rc b/sys-cluster/cman/files/cman-1.0x.rc
deleted file mode 100755
index 0b765c217879..000000000000
--- a/sys-cluster/cman/files/cman-1.0x.rc
+++ /dev/null
@@ -1,171 +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-cluster/cman/files/cman-1.0x.rc,v 1.1 2008/03/17 16:47:11 xmerlin Exp $
-
-depend() {
-	use net
-	need ccs
-	provide cluster-manager
-}
-
-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} > /dev/null
-		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} > /dev/null
-		eend $? "Failed to unload ${module} kernel module"
-	done
-}
-
-unload_gfs_modules() {
-	if [ -f /proc/fs/gfs ]; then
-		modules="gfs lock_harness"
-	fi
-	if [ -d /proc/cluster/lock_dlm ]; then
-		modules="${modules} lock_dlm"
-	fi
-	if [ -d /proc/cluster/lock_gulm ]; then
-		modules="${modules} lock_gulm"
-	fi
-	unload_modules ${modules}
-}
-
-
-start() {
-	#if grep -qE "<[[:space:]]*gulm([[:space:]]|[>]|$)" /etc/cluster/cluster.conf
-	#then
-	#	die "<gulm> section detected in /etc/cluster/cluster.conf"
-	#fi
-
-	if [ ! -d /proc/cluster/config/cman ]; then
-		load_modules cman
-	fi
-
-	ebegin "Starting cman"
-	/sbin/cman_tool -t ${CMAN_CLUSTER_TIMEOUT} \
-		-w join ${CMAN_JOIN_OPTS} > /dev/null
-	
-	if [ "$?" -ne 0 ]
-	then
-		ewend 1 "Failed to start cman"
-	else
-		eend 0
-		
-		# make sure that we are quorate?  
-		if [ ${CMAN_QUORUM_TIMEOUT} -gt 0 ]
-		then
-			ebegin "Waiting for quorum (${CMAN_QUORUM_TIMEOUT} secs)"
-			/sbin/cman_tool -t ${CMAN_QUORUM_TIMEOUT} -q wait
-			eend $?
-		fi
-	fi
-}
-
-stop() {
-	
-	# umount GFS filesystems
-	umount_gfs_filesystems
-	
-	# shutdown clvm, fenced services
-	# need to be fixed (clvm missing)
-	local fence_status="$(cman_tool services | awk '$1 ~ /Fence/ { print $3 }')"
-	if [ -n "${fence_status}" ]; then
-		if [ -x /sbin/fence_tool ]; then
-			ebegin "Stopping fence domain"
-			/sbin/fence_tool leave > /dev/null 2>&1
-			eend $?
-		fi
-	fi
-	
-	# shutdown dlm, gfs
-	unload_gfs_modules
-	
-	ebegin "Stopping cman"
-	local retry stat
-	local cman_status
-	cman_status="$(cman_tool status | awk '$1 ~ /Membership/ { print $3 }')"
-	
-	if [ "${cman_status}" != "Not-in-Cluster" -a -d /proc/cluster/config/cman ]; then
-		retry=3
-		stat=1
-		while [ "${stat}" -eq 1 -a "${retry}" -gt 0 ]
-		do
-			/sbin/cman_tool -w -t ${CMAN_SHUTDOWN_TIMEOUT} \
-				leave ${CMAN_LEAVE_OPTS} > /dev/null
-				
-			stat=$?
-			retry=$((${retry} -1))
-		done
-		
-		#if [ "${stat}" -ne 0 ]; then
-		#	/sbin/cman_tool -w -t 2 leave force > /dev/null
-		#fi
-		
-		#if [ "$?" -ne 0 ]
-		#then
-		#	ewend 1 "Failed to stop cman"
-		#else
-		#	eend 0
-		#fi
-	else
-		stat=0
-	fi
-
-	eend ${stat}
-
-	if [ "${stat}" -eq 0 ]; then
-		sleep 1s
-		
-		#ebegin "Unloading cman kernel module"
-		#modprobe -r cman &> /dev/null || return 0
-		#eend $?
-		
-		unload_modules cman
-	fi
-}
-
diff --git a/sys-cluster/cman/files/cman-2.02.00-include.patch b/sys-cluster/cman/files/cman-2.02.00-include.patch
deleted file mode 100644
index 9dc8de388904..000000000000
--- a/sys-cluster/cman/files/cman-2.02.00-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- cluster-2.02.00/cman/lib/Makefile.orig	2008-02-26 15:37:43.000000000 +0000
-+++ cluster-2.02.00/cman/lib/Makefile	2008-03-16 15:08:59.000000000 +0000
-@@ -13,6 +13,8 @@
- 
- TARGET= libcman
- 
-+include ../../make/defines.mk
-+
- LIBDIRT=$(TARGET).a \
- 	$(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR)
- 
-@@ -21,8 +23,6 @@
- 
- INCDIRT=$(TARGET).h
- 
--include ../../make/defines.mk
--
- SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}
- STATICLIB=$(TARGET).a
- 
diff --git a/sys-cluster/cman/files/qdiskd-1.0x.rc b/sys-cluster/cman/files/qdiskd-1.0x.rc
deleted file mode 100755
index ed3e24c4cf35..000000000000
--- a/sys-cluster/cman/files/qdiskd-1.0x.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/files/qdiskd-1.0x.rc,v 1.1 2008/03/17 16:47:11 xmerlin Exp $
-
-depend() {
-	use net
-	need cluster-manager
-}
-
-start() {
-	ebegin "Starting the Quorum Disk Daemon"
-	start-stop-daemon --start --quiet --exec /sbin/qdiskd -- -Q
-        eend $? "Failed to start qdiskd"
-}
-
-stop() {
-	ebegin "Stopping the Quorum Disk Daemon"
-
-	start-stop-daemon --stop --pidfile /var/run/qdiskd.pid
-        eend $? "Failed to stop qdiskd"
-}
-
diff --git a/sys-cluster/dlm-lib/ChangeLog b/sys-cluster/dlm-lib/ChangeLog
index f01c3e58bd7d..091ef183daa1 100644
--- a/sys-cluster/dlm-lib/ChangeLog
+++ b/sys-cluster/dlm-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/dlm-lib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/ChangeLog,v 1.3 2008/03/23 17:09:49 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/ChangeLog,v 1.4 2008/11/13 19:02:22 xmerlin Exp $
+
+*dlm-lib-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -dlm-lib-2.02.00.ebuild, -dlm-lib-2.02.00-r1.ebuild,
+  +dlm-lib-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
 
   23 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
   dlm-lib-2.02.00-r1.ebuild:
diff --git a/sys-cluster/dlm-lib/dlm-lib-2.02.00-r1.ebuild b/sys-cluster/dlm-lib/dlm-lib-2.02.00-r1.ebuild
deleted file mode 100644
index 9d3162ea8574..000000000000
--- a/sys-cluster/dlm-lib/dlm-lib-2.02.00-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/dlm-lib-2.02.00-r1.ebuild,v 1.2 2008/03/23 17:09:49 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="General-purpose Distributed Lock Manager"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2
-	http://dev.gentoo.org/~xmerlin/gfs/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-kernel/linux-headers-2.6.24
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
-	"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/${PN/-//}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix the manual pages have executable bit
-	#sed -i -e '
-	#	/\tinstall -d/s/install/& -m 0755/; t
-	#	/\tinstall/s/install/& -m 0644/' \
-	#	man/Makefile || die "failed patching man pages permission"
-
-	(cd "${WORKDIR}"/${MY_P};
-		epatch "${WORKDIR}"/gfs-2.02.00-20080323-cvs.patch || die
-	)
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
-	) || die "configure problem"
-
-	#emake clean || die "clean problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-}
diff --git a/sys-cluster/dlm-lib/dlm-lib-2.02.00.ebuild b/sys-cluster/dlm-lib/dlm-lib-2.03.09.ebuild
index 497978637c11..03956ab21bb6 100644
--- a/sys-cluster/dlm-lib/dlm-lib-2.02.00.ebuild
+++ b/sys-cluster/dlm-lib/dlm-lib-2.03.09.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/dlm-lib-2.02.00.ebuild,v 1.1 2008/03/17 16:26:21 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/dlm-lib-2.03.09.ebuild,v 1.1 2008/11/13 19:02:22 xmerlin Exp $
 
-inherit eutils versionator
+inherit eutils linux-mod linux-info versionator
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=sys-kernel/linux-headers-2.6.23
+DEPEND=">=sys-kernel/linux-headers-2.6.24
 	!sys-cluster/dlm-headers
 	!sys-cluster/dlm-kernel
 	"
@@ -38,7 +38,6 @@ src_unpack() {
 	#	/\tinstall/s/install/& -m 0644/' \
 	#	man/Makefile || die "failed patching man pages permission"
 
-	epatch "${FILESDIR}"/${P}-include.patch || die
 }
 
 src_compile() {
@@ -47,14 +46,15 @@ src_compile() {
 			--cc=$(tc-getCC) \
 			--cflags="-Wall" \
 			--disable_kernel_check \
-			--release_major="$MAJ_PV" \
-			--release_minor="$MIN_PV" \
+			--kernel_src=${KERNEL_DIR} \
+			--somajor="$MAJ_PV" \
+			--sominor="$MIN_PV" \
 			--cmanlibdir=/usr/lib \
 			--cmanincdir=/usr/include \
 	) || die "configure problem"
 
 	#emake clean || die "clean problem"
-	emake || die "compile problem"
+	emake -j1 || die "compile problem"
 }
 
 src_install() {
diff --git a/sys-cluster/dlm/ChangeLog b/sys-cluster/dlm/ChangeLog
index dfc87f333be3..16289281e63f 100644
--- a/sys-cluster/dlm/ChangeLog
+++ b/sys-cluster/dlm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/dlm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.34 2008/04/10 08:15:45 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.35 2008/11/13 19:01:06 xmerlin Exp $
+
+*dlm-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -dlm-1.02.00-r1.ebuild, -dlm-1.03.00.ebuild, -dlm-1.04.00.ebuild,
+  -dlm-2.02.00.ebuild, -dlm-2.02.00-r1.ebuild, +dlm-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
 
   10 Apr 2008; Christian Zoffoli <xmerlin@gentoo.org> dlm-2.02.00.ebuild,
   dlm-2.02.00-r1.ebuild:
diff --git a/sys-cluster/dlm/dlm-1.02.00-r1.ebuild b/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
deleted file mode 100644
index b836ea0ce9fc..000000000000
--- a/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.02.00-r1.ebuild,v 1.6 2008/03/17 16:43:31 xmerlin Exp $
-
-CLUSTER_RELEASE="1.02.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="General-purpose Distributed Lock Manager"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-IUSE=""
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86"
-
-DEPEND="=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-	rm -f "${D}"/usr/include/libdlm.h
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN} || die
-	dodoc doc/*.txt
-}
diff --git a/sys-cluster/dlm/dlm-1.03.00.ebuild b/sys-cluster/dlm/dlm-1.03.00.ebuild
deleted file mode 100644
index ff683f757f8c..000000000000
--- a/sys-cluster/dlm/dlm-1.03.00.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.03.00.ebuild,v 1.6 2008/03/17 16:43:31 xmerlin Exp $
-
-CLUSTER_RELEASE="1.03.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="General-purpose Distributed Lock Manager"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-IUSE=""
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86"
-
-DEPEND="=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-	rm -f "${D}"/usr/include/libdlm.h
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN} || die
-	dodoc doc/*.txt
-}
diff --git a/sys-cluster/dlm/dlm-1.04.00.ebuild b/sys-cluster/dlm/dlm-1.04.00.ebuild
deleted file mode 100644
index a5ad4a29e267..000000000000
--- a/sys-cluster/dlm/dlm-1.04.00.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.04.00.ebuild,v 1.2 2008/03/17 16:43:31 xmerlin Exp $
-
-CLUSTER_RELEASE="1.04.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="General-purpose Distributed Lock Manager"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-IUSE=""
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-DEPEND="=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-	rm -f "${D}"/usr/include/libdlm.h
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN} || die
-	dodoc doc/*.txt
-}
diff --git a/sys-cluster/dlm/dlm-2.02.00-r1.ebuild b/sys-cluster/dlm/dlm-2.02.00-r1.ebuild
deleted file mode 100644
index 67912b04ea74..000000000000
--- a/sys-cluster/dlm/dlm-2.02.00-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-2.02.00-r1.ebuild,v 1.3 2008/04/10 08:15:45 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="General-purpose Distributed Lock Manager"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2
-	http://dev.gentoo.org/~xmerlin/gfs/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-kernel/linux-headers-2.6.24
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
-	=sys-cluster/dlm-lib-${CLUSTER_RELEASE}*
-	"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix the manual pages have executable bit
-	sed -i -e '
-		/\tinstall -d/s/install/& -m 0755/; t
-		/\tinstall/s/install/& -m 0644/' \
-		man/Makefile || die "failed patching man pages permission"
-
-	(cd "${WORKDIR}"/${MY_P};
-		epatch "${WORKDIR}"/gfs-2.02.00-20080323-cvs.patch || die
-	)
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--dlmlibdir=/usr/lib \
-			--dlmincdir=/usr/include \
-	) || die "configure problem"
-
-	emake clean || die "clean problem"
-	for i in tool man; do
-		emake -C $i || die "compile problem"
-	done
-}
-
-src_install() {
-	for i in tool man; do
-		emake DESTDIR="${D}" -C $i install || die "install problem"
-	done
-
-	dodoc doc/*.txt
-}
diff --git a/sys-cluster/dlm/dlm-2.02.00.ebuild b/sys-cluster/dlm/dlm-2.03.09.ebuild
index 778d24b0edeb..0cbf528f7e37 100644
--- a/sys-cluster/dlm/dlm-2.02.00.ebuild
+++ b/sys-cluster/dlm/dlm-2.03.09.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-2.02.00.ebuild,v 1.3 2008/04/10 15:11:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-2.03.09.ebuild,v 1.1 2008/11/13 19:01:06 xmerlin Exp $
 
-inherit eutils versionator
+inherit eutils linux-mod linux-info versionator
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=sys-kernel/linux-headers-2.6.23
+DEPEND=">=sys-kernel/linux-headers-2.6.24
 	!sys-cluster/dlm-headers
 	!sys-cluster/dlm-kernel
 	=sys-cluster/dlm-lib-${CLUSTER_RELEASE}*
@@ -39,7 +39,7 @@ src_unpack() {
 		/\tinstall/s/install/& -m 0644/' \
 		man/Makefile || die "failed patching man pages permission"
 
-	epatch "${FILESDIR}"/${P}-include.patch || die
+#	epatch "${FILESDIR}"/${P}-include.patch || die
 }
 
 src_compile() {
@@ -48,8 +48,9 @@ src_compile() {
 			--cc=$(tc-getCC) \
 			--cflags="-Wall" \
 			--disable_kernel_check \
-			--release_major="$MAJ_PV" \
-			--release_minor="$MIN_PV" \
+			--kernel_src=${KERNEL_DIR} \
+			--somajor="$MAJ_PV" \
+			--sominor="$MIN_PV" \
 			--cmanlibdir=/usr/lib \
 			--dlmlibdir=/usr/lib \
 			--dlmincdir=/usr/include \
diff --git a/sys-cluster/fence/ChangeLog b/sys-cluster/fence/ChangeLog
index f3bbb423b1e9..62b56901aec3 100644
--- a/sys-cluster/fence/ChangeLog
+++ b/sys-cluster/fence/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/fence
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/ChangeLog,v 1.33 2008/03/23 16:35:39 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/ChangeLog,v 1.34 2008/11/13 19:03:56 xmerlin Exp $
+
+*fence-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -fence-1.02.00-r1.ebuild, -fence-1.03.00.ebuild, -fence-1.04.00.ebuild,
+  -fence-2.02.00.ebuild, -fence-2.02.00-r1.ebuild, +fence-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
 
 *fence-2.02.00-r1 (23 Mar 2008)
 
diff --git a/sys-cluster/fence/fence-1.02.00-r1.ebuild b/sys-cluster/fence/fence-1.02.00-r1.ebuild
deleted file mode 100644
index 249cde390eef..000000000000
--- a/sys-cluster/fence/fence-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/fence-1.02.00-r1.ebuild,v 1.7 2008/03/17 16:38:40 xmerlin Exp $
-
-inherit eutils
-
-CLUSTER_RELEASE="1.02.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-CVS_RELEASE="20060713"
-
-DESCRIPTION="I/O fencing system"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*
-	dev-perl/Net-Telnet
-	dev-perl/Net-SSLeay"
-
-RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	dev-perl/Net-Telnet
-	dev-perl/Net-SSLeay"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${PN}-${PV}-${CVS_RELEASE}-cvs.patch || die
-}
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	into /
-	dosbin "${FILESDIR}"/${PN}_xen || die
-
-	newinitd "${FILESDIR}"/${PN}d.rc ${PN}d || die
-	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
-}
diff --git a/sys-cluster/fence/fence-1.03.00.ebuild b/sys-cluster/fence/fence-1.03.00.ebuild
deleted file mode 100644
index c4963e8b6bc0..000000000000
--- a/sys-cluster/fence/fence-1.03.00.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/fence-1.03.00.ebuild,v 1.5 2008/03/17 16:38:40 xmerlin Exp $
-
-CLUSTER_RELEASE="1.03.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="I/O fencing system"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*
-	dev-perl/Net-Telnet
-	dev-perl/Net-SSLeay"
-
-RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	dev-perl/Net-Telnet
-	dev-perl/Net-SSLeay"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	into /
-	dosbin "${FILESDIR}"/${PN}_xen || die
-
-	newinitd "${FILESDIR}"/${PN}d.rc ${PN}d || die
-	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
-}
diff --git a/sys-cluster/fence/fence-1.04.00.ebuild b/sys-cluster/fence/fence-1.04.00.ebuild
deleted file mode 100644
index 2ab1e8fdbd0a..000000000000
--- a/sys-cluster/fence/fence-1.04.00.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/fence-1.04.00.ebuild,v 1.2 2008/03/17 16:38:40 xmerlin Exp $
-
-CLUSTER_RELEASE="1.04.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="I/O fencing system"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*
-	dev-perl/Net-Telnet
-	dev-perl/Net-SSLeay"
-
-RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	dev-perl/Net-Telnet
-	dev-perl/Net-SSLeay"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	into /
-	dosbin "${FILESDIR}"/${PN}_xen || die
-
-	newinitd "${FILESDIR}"/${PN}d.rc ${PN}d || die
-	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
-}
diff --git a/sys-cluster/fence/fence-2.02.00-r1.ebuild b/sys-cluster/fence/fence-2.02.00-r1.ebuild
deleted file mode 100644
index 4c4092fabbc5..000000000000
--- a/sys-cluster/fence/fence-2.02.00-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/fence-2.02.00-r1.ebuild,v 1.1 2008/03/23 16:35:39 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="I/O group fencing system"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2
-	http://dev.gentoo.org/~xmerlin/gfs/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/openais-0.80.3*
-	=sys-cluster/dlm-lib-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-lib-${CLUSTER_RELEASE}*
-	dev-perl/Net-Telnet
-	dev-perl/Net-SSLeay
-	"
-
-RDEPEND="$DEPEND"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	(cd "${WORKDIR}"/${MY_P};
-		epatch "${WORKDIR}"/gfs-2.02.00-20080323-cvs.patch || die
-	)
-
-	chmod u+x "${WORKDIR}"/${MY_P}/scripts/define2var
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--dlmlibdir=/usr/lib \
-			--dlmincdir=/usr/include \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
-	) || die "configure problem"
-
-	(cd "${WORKDIR}"/${MY_P}/group;
-		emake -j1 clean all \
-	) || die "compile problem"
-
-	# 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() {
-	(cd "${WORKDIR}"/${MY_P}/group;
-		emake DESTDIR="${D}" install \
-	) || die "install problem"
-
-	emake DESTDIR="${D}" install || die "install problem"
-}
diff --git a/sys-cluster/fence/fence-2.02.00.ebuild b/sys-cluster/fence/fence-2.03.09.ebuild
index 055d640ccba3..71b919bada37 100644
--- a/sys-cluster/fence/fence-2.02.00.ebuild
+++ b/sys-cluster/fence/fence-2.03.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/fence-2.02.00.ebuild,v 1.1 2008/03/17 16:38:40 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/fence-2.03.09.ebuild,v 1.1 2008/11/13 19:03:56 xmerlin Exp $
 
 inherit eutils versionator
 
@@ -43,8 +43,6 @@ src_compile() {
 			--cc=$(tc-getCC) \
 			--cflags="-Wall" \
 			--disable_kernel_check \
-			--release_major="$MAJ_PV" \
-			--release_minor="$MIN_PV" \
 			--dlmlibdir=/usr/lib \
 			--dlmincdir=/usr/include \
 			--cmanlibdir=/usr/lib \
diff --git a/sys-cluster/gnbd/ChangeLog b/sys-cluster/gnbd/ChangeLog
index 93291fc6cca5..efc4ae7ef80f 100644
--- a/sys-cluster/gnbd/ChangeLog
+++ b/sys-cluster/gnbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/gnbd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/ChangeLog,v 1.26 2008/08/20 17:45:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/ChangeLog,v 1.27 2008/11/13 19:07:38 xmerlin Exp $
+
+*gnbd-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> -gnbd-2.02.00.ebuild,
+  -gnbd-2.02.00-r1.ebuild, +gnbd-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
 
   20 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
   -files/gnbd-client-1.0x.conf, -files/gnbd-srv-1.0x.conf,
diff --git a/sys-cluster/gnbd/gnbd-2.02.00-r1.ebuild b/sys-cluster/gnbd/gnbd-2.02.00-r1.ebuild
deleted file mode 100644
index 96739d3afda4..000000000000
--- a/sys-cluster/gnbd/gnbd-2.02.00-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-2.02.00-r1.ebuild,v 1.1 2008/03/23 16:39:50 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="GFS Network Block Devices"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2
-	http://dev.gentoo.org/~xmerlin/gfs/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=sys-cluster/cman-lib-${CLUSTER_RELEASE}*"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	(cd "${WORKDIR}"/${MY_P};
-		epatch "${WORKDIR}"/gfs-2.02.00-20080323-cvs.patch || die
-	)
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--dlmlibdir=/usr/lib \
-			--dlmincdir=/usr/include \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
-	) || die "configure problem"
-
-	# 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 clean all || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}-client-2.0x.rc ${PN}-client || die
-	newinitd "${FILESDIR}"/${PN}-srv-2.0x.rc ${PN}-srv || die
-
-	doconfd "${FILESDIR}"/${PN}-client-2.0x.conf || die
-	doconfd "${FILESDIR}"/${PN}-srv-2.0x.conf || die
-
-	insinto /etc
-	doins "${FILESDIR}"/gnbdtab
-
-	if $(has_version sys-fs/devfsd ) ; then
-		insinto /etc/devfs.d/
-		newins "${FILESDIR}"/gnbd.devfs gnbd
-	fi
-}
diff --git a/sys-cluster/gnbd/gnbd-2.02.00.ebuild b/sys-cluster/gnbd/gnbd-2.03.09.ebuild
index 4df9e5308b52..2302a9520354 100644
--- a/sys-cluster/gnbd/gnbd-2.02.00.ebuild
+++ b/sys-cluster/gnbd/gnbd-2.03.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-2.02.00.ebuild,v 1.2 2008/03/17 17:19:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-2.03.09.ebuild,v 1.1 2008/11/13 19:07:38 xmerlin Exp $
 
 inherit eutils versionator
 
@@ -30,8 +30,6 @@ src_compile() {
 			--cc=$(tc-getCC) \
 			--cflags="-Wall" \
 			--disable_kernel_check \
-			--release_major="$MAJ_PV" \
-			--release_minor="$MIN_PV" \
 			--dlmlibdir=/usr/lib \
 			--dlmincdir=/usr/include \
 			--cmanlibdir=/usr/lib \