Version bump.

Package-Manager: portage-2.1.2-r9

26 files changed, 321 insertions, 63 deletions

diff --git a/sys-cluster/dlm/ChangeLog b/sys-cluster/dlm/ChangeLog
index 6e07070809be..4a70feb5fa46 100644
--- a/sys-cluster/dlm/ChangeLog
+++ b/sys-cluster/dlm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/dlm
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.26 2006/10/14 17:55:35 xmerlin Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.27 2007/03/09 11:11:59 xmerlin Exp $
+
+*dlm-1.04.00 (03 Mar 2007)
+
+  03 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org> files/dlm.rc,
+  +dlm-1.04.00.ebuild:
+  Version bump.
 
   14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org> -dlm-1.01.00.ebuild,
   -dlm-1.02.00.ebuild, dlm-1.02.00-r1.ebuild, dlm-1.03.00.ebuild:
diff --git a/sys-cluster/dlm/dlm-1.02.00-r1.ebuild b/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
index 7a089b4bec37..546b3e1955b8 100644
--- a/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
+++ b/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.4 2006/10/14 17:55:35 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.02.00-r1.ebuild,v 1.5 2007/03/09 11:11:59 xmerlin Exp $
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.02.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="General-purpose Distributed Lock Manager"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -14,7 +15,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86"
 
-DEPEND=">=sys-cluster/dlm-headers-1.02.00-r1"
+DEPEND="=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/${PN}"
@@ -26,8 +27,8 @@ src_compile() {
 
 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
index 7f4b2b502eec..cf26aa3062e3 100644
--- a/sys-cluster/dlm/dlm-1.03.00.ebuild
+++ b/sys-cluster/dlm/dlm-1.03.00.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.2 2006/10/14 17:55:35 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.03.00.ebuild,v 1.3 2007/03/09 11:11:59 xmerlin Exp $
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.03.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="General-purpose Distributed Lock Manager"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -14,7 +15,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 
-DEPEND=">=sys-cluster/dlm-headers-1.03.00"
+DEPEND="=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/${PN}"
@@ -26,6 +27,7 @@ src_compile() {
 
 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
new file mode 100644
index 000000000000..140f67660377
--- /dev/null
+++ b/sys-cluster/dlm/dlm-1.04.00.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 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.1 2007/03/09 11:11:59 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/files/digest-dlm-1.04.00 b/sys-cluster/dlm/files/digest-dlm-1.04.00
new file mode 100644
index 000000000000..2f86eed7f8e5
--- /dev/null
+++ b/sys-cluster/dlm/files/digest-dlm-1.04.00
@@ -0,0 +1,3 @@
+MD5 d1a0363109d0188959ec35b7d6ebfb67 cluster-1.04.00.tar.gz 1663798
+RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 cluster-1.04.00.tar.gz 1663798
+SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 cluster-1.04.00.tar.gz 1663798
diff --git a/sys-cluster/dlm/files/dlm.rc b/sys-cluster/dlm/files/dlm.rc
index 36f4750c9d49..e1d07c7f3fc0 100755
--- a/sys-cluster/dlm/files/dlm.rc
+++ b/sys-cluster/dlm/files/dlm.rc
@@ -1,11 +1,11 @@
 #!/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/dlm/files/dlm.rc,v 1.3 2005/03/25 02:14:00 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/files/dlm.rc,v 1.4 2007/03/09 11:11:59 xmerlin Exp $
 
 depend() {
 	use net
-	need cman
+	need cluster-manager
 	provide cluster-locking-manager
 }
 
diff --git a/sys-cluster/fence/ChangeLog b/sys-cluster/fence/ChangeLog
index 0543836fed01..4f4c810e27a9 100644
--- a/sys-cluster/fence/ChangeLog
+++ b/sys-cluster/fence/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/fence
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/ChangeLog,v 1.28 2006/10/14 18:31:38 xmerlin Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/ChangeLog,v 1.29 2007/03/09 11:13:36 xmerlin Exp $
+
+*fence-1.04.00 (03 Mar 2007)
+
+  03 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org> +fence-1.04.00.ebuild:
+  Version bump.
 
   14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org> -fence-1.01.00.ebuild,
   -fence-1.02.00.ebuild, fence-1.02.00-r1.ebuild, fence-1.03.00.ebuild:
diff --git a/sys-cluster/fence/fence-1.02.00-r1.ebuild b/sys-cluster/fence/fence-1.02.00-r1.ebuild
index cda234e2ed17..f2f6f0df1915 100644
--- a/sys-cluster/fence/fence-1.02.00-r1.ebuild
+++ b/sys-cluster/fence/fence-1.02.00-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.5 2006/10/14 18:31:38 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/fence-1.02.00-r1.ebuild,v 1.6 2007/03/09 11:13:36 xmerlin Exp $
 
 inherit eutils
 
+CLUSTER_RELEASE="1.02.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 CVS_RELEASE="20060713"
-MY_P="cluster-${PV}"
 
 DESCRIPTION="I/O fencing system"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -18,11 +19,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-DEPEND=">=sys-cluster/ccs-1.02.00-r1
-	>=sys-cluster/cman-headers-1.02.00-r1
+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}"
 
diff --git a/sys-cluster/fence/fence-1.03.00.ebuild b/sys-cluster/fence/fence-1.03.00.ebuild
index 306d0b8f0e3e..f3098bc7dc8e 100644
--- a/sys-cluster/fence/fence-1.03.00.ebuild
+++ b/sys-cluster/fence/fence-1.03.00.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.2 2006/10/14 18:31:38 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/fence-1.03.00.ebuild,v 1.3 2007/03/09 11:13:36 xmerlin Exp $
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.03.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="I/O fencing system"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -14,11 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=sys-cluster/ccs-1.03.00
-	>=sys-cluster/cman-headers-1.03.00
+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}"
 
diff --git a/sys-cluster/fence/fence-1.04.00.ebuild b/sys-cluster/fence/fence-1.04.00.ebuild
new file mode 100644
index 000000000000..7d8c61e4dc9b
--- /dev/null
+++ b/sys-cluster/fence/fence-1.04.00.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 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.1 2007/03/09 11:13:36 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/files/digest-fence-1.04.00 b/sys-cluster/fence/files/digest-fence-1.04.00
new file mode 100644
index 000000000000..2f86eed7f8e5
--- /dev/null
+++ b/sys-cluster/fence/files/digest-fence-1.04.00
@@ -0,0 +1,3 @@
+MD5 d1a0363109d0188959ec35b7d6ebfb67 cluster-1.04.00.tar.gz 1663798
+RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 cluster-1.04.00.tar.gz 1663798
+SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 cluster-1.04.00.tar.gz 1663798
diff --git a/sys-cluster/gnbd-headers/ChangeLog b/sys-cluster/gnbd-headers/ChangeLog
index 46f33f3ee60b..7451469e4945 100644
--- a/sys-cluster/gnbd-headers/ChangeLog
+++ b/sys-cluster/gnbd-headers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/gnbd-headers
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-headers/ChangeLog,v 1.12 2006/10/15 14:04:36 xmerlin Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-headers/ChangeLog,v 1.13 2007/03/09 11:17:11 xmerlin Exp $
+
+*gnbd-headers-1.04.00 (09 Mar 2007)
+
+  09 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  gnbd-headers-1.02.00-r1.ebuild, gnbd-headers-1.03.00.ebuild,
+  +gnbd-headers-1.04.00.ebuild:
+  Version bump.
 
   15 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
   gnbd-headers-1.02.00-r1.ebuild, gnbd-headers-1.03.00.ebuild:
diff --git a/sys-cluster/gnbd-headers/files/digest-gnbd-headers-1.04.00 b/sys-cluster/gnbd-headers/files/digest-gnbd-headers-1.04.00
new file mode 100644
index 000000000000..2f86eed7f8e5
--- /dev/null
+++ b/sys-cluster/gnbd-headers/files/digest-gnbd-headers-1.04.00
@@ -0,0 +1,3 @@
+MD5 d1a0363109d0188959ec35b7d6ebfb67 cluster-1.04.00.tar.gz 1663798
+RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 cluster-1.04.00.tar.gz 1663798
+SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 cluster-1.04.00.tar.gz 1663798
diff --git a/sys-cluster/gnbd-headers/gnbd-headers-1.02.00-r1.ebuild b/sys-cluster/gnbd-headers/gnbd-headers-1.02.00-r1.ebuild
index 4d803b75bf41..fbcf8b18ac4f 100644
--- a/sys-cluster/gnbd-headers/gnbd-headers-1.02.00-r1.ebuild
+++ b/sys-cluster/gnbd-headers/gnbd-headers-1.02.00-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-headers/gnbd-headers-1.02.00-r1.ebuild,v 1.3 2006/10/15 14:04:36 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-headers/gnbd-headers-1.02.00-r1.ebuild,v 1.4 2007/03/09 11:17:11 xmerlin Exp $
 
 inherit eutils
 
+CLUSTER_RELEASE="1.02.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 CVS_RELEASE="20060713"
-MY_P="cluster-${PV}"
 
 DESCRIPTION="GFS Network Block Devices headers"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -18,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="!<sys-cluster/gnbd-kernel-1.02.00-r1"
+DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/${PN/headers/kernel}"
diff --git a/sys-cluster/gnbd-headers/gnbd-headers-1.03.00.ebuild b/sys-cluster/gnbd-headers/gnbd-headers-1.03.00.ebuild
index cffcdce7b70e..ee9aa6b9a60b 100644
--- a/sys-cluster/gnbd-headers/gnbd-headers-1.03.00.ebuild
+++ b/sys-cluster/gnbd-headers/gnbd-headers-1.03.00.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-headers/gnbd-headers-1.03.00.ebuild,v 1.2 2006/10/15 14:04:36 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-headers/gnbd-headers-1.03.00.ebuild,v 1.3 2007/03/09 11:17:11 xmerlin Exp $
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.03.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="GFS Network Block Devices headers"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -13,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="!<sys-cluster/gnbd-kernel-1.03.00"
+DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/${PN/headers/kernel}"
diff --git a/sys-cluster/gnbd-headers/gnbd-headers-1.04.00.ebuild b/sys-cluster/gnbd-headers/gnbd-headers-1.04.00.ebuild
new file mode 100644
index 000000000000..c978f58e068b
--- /dev/null
+++ b/sys-cluster/gnbd-headers/gnbd-headers-1.04.00.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-headers/gnbd-headers-1.04.00.ebuild,v 1.1 2007/03/09 11:17:11 xmerlin Exp $
+
+CLUSTER_RELEASE="1.04.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+DESCRIPTION="GFS Network Block Devices headers"
+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=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}/${PN/headers/kernel}"
+
+src_compile() {
+	einfo "No compilation necessary"
+}
+
+src_install() {
+	insinto /usr/include/linux
+	doins src/gnbd.h || die
+}
diff --git a/sys-cluster/gnbd/ChangeLog b/sys-cluster/gnbd/ChangeLog
index 8bee381c01da..95b67114a3fe 100644
--- a/sys-cluster/gnbd/ChangeLog
+++ b/sys-cluster/gnbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/gnbd
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/ChangeLog,v 1.19 2006/10/15 14:03:27 xmerlin Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/ChangeLog,v 1.20 2007/03/09 11:19:32 xmerlin Exp $
+
+*gnbd-1.04.00 (09 Mar 2007)
+
+  09 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  gnbd-1.02.00-r1.ebuild, gnbd-1.03.00.ebuild, +gnbd-1.04.00.ebuild:
+  Version bump.
 
   15 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
   gnbd-1.02.00-r1.ebuild, gnbd-1.03.00.ebuild:
diff --git a/sys-cluster/gnbd/files/digest-gnbd-1.04.00 b/sys-cluster/gnbd/files/digest-gnbd-1.04.00
new file mode 100644
index 000000000000..2f86eed7f8e5
--- /dev/null
+++ b/sys-cluster/gnbd/files/digest-gnbd-1.04.00
@@ -0,0 +1,3 @@
+MD5 d1a0363109d0188959ec35b7d6ebfb67 cluster-1.04.00.tar.gz 1663798
+RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 cluster-1.04.00.tar.gz 1663798
+SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 cluster-1.04.00.tar.gz 1663798
diff --git a/sys-cluster/gnbd/gnbd-1.02.00-r1.ebuild b/sys-cluster/gnbd/gnbd-1.02.00-r1.ebuild
index 994c4eb3bdcd..ff3709388ddc 100644
--- a/sys-cluster/gnbd/gnbd-1.02.00-r1.ebuild
+++ b/sys-cluster/gnbd/gnbd-1.02.00-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-1.02.00-r1.ebuild,v 1.4 2006/10/15 14:03:27 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-1.02.00-r1.ebuild,v 1.5 2007/03/09 11:19:32 xmerlin Exp $
 
 inherit eutils
 
+CLUSTER_RELEASE="1.02.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 CVS_RELEASE="20060713"
-MY_P="cluster-${PV}"
 
 DESCRIPTION="GFS Network Block Devices"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -18,8 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-DEPEND=">=sys-cluster/magma-1.02.00-r1
-	>=sys-cluster/gnbd-headers-1.02.00-r1
+DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
+	=sys-cluster/gnbd-headers-${CLUSTER_RELEASE}*
 	<sys-fs/sysfsutils-2.0.0"
 
 RDEPEND="${DEPEND}"
diff --git a/sys-cluster/gnbd/gnbd-1.03.00.ebuild b/sys-cluster/gnbd/gnbd-1.03.00.ebuild
index 1cf464b05d1b..8c9cf7e00b0b 100644
--- a/sys-cluster/gnbd/gnbd-1.03.00.ebuild
+++ b/sys-cluster/gnbd/gnbd-1.03.00.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-1.03.00.ebuild,v 1.3 2006/10/15 14:03:27 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-1.03.00.ebuild,v 1.4 2007/03/09 11:19:32 xmerlin Exp $
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.03.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="GFS Network Block Devices"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -13,8 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=sys-cluster/magma-1.03.00
-	>=sys-cluster/gnbd-headers-1.03.00
+DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
+	=sys-cluster/gnbd-headers-${CLUSTER_RELEASE}*
 	<sys-fs/sysfsutils-2.0.0"
 
 RDEPEND="${DEPEND}"
diff --git a/sys-cluster/gnbd/gnbd-1.04.00.ebuild b/sys-cluster/gnbd/gnbd-1.04.00.ebuild
new file mode 100644
index 000000000000..64b42940b590
--- /dev/null
+++ b/sys-cluster/gnbd/gnbd-1.04.00.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-1.04.00.ebuild,v 1.1 2007/03/09 11:19:32 xmerlin Exp $
+
+CLUSTER_RELEASE="1.04.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+DESCRIPTION="GFS Network Block Devices"
+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/magma-${CLUSTER_RELEASE}*
+	=sys-cluster/gnbd-headers-${CLUSTER_RELEASE}*
+	<sys-fs/sysfsutils-2.0.0"
+
+RDEPEND="${DEPEND}"
+
+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}-client.rc ${PN}-client || die
+	newinitd ${FILESDIR}/${PN}-srv.rc ${PN}-srv || die
+
+	doconfd ${FILESDIR}/${PN}-client.conf || die
+	doconfd ${FILESDIR}/${PN}-srv.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/magma-plugins/ChangeLog b/sys-cluster/magma-plugins/ChangeLog
index bce7a13b7b7a..a31470001861 100644
--- a/sys-cluster/magma-plugins/ChangeLog
+++ b/sys-cluster/magma-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/magma-plugins
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma-plugins/ChangeLog,v 1.17 2006/10/14 17:41:15 xmerlin Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma-plugins/ChangeLog,v 1.18 2007/03/09 11:15:04 xmerlin Exp $
+
+*magma-plugins-1.04.00 (09 Mar 2007)
+
+  09 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  magma-plugins-1.02.00-r1.ebuild, magma-plugins-1.03.00.ebuild,
+  +magma-plugins-1.04.00.ebuild:
+  Version bump.
 
   14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
   -magma-plugins-1.01.00.ebuild, -magma-plugins-1.02.00.ebuild,
diff --git a/sys-cluster/magma-plugins/files/digest-magma-plugins-1.04.00 b/sys-cluster/magma-plugins/files/digest-magma-plugins-1.04.00
new file mode 100644
index 000000000000..2f86eed7f8e5
--- /dev/null
+++ b/sys-cluster/magma-plugins/files/digest-magma-plugins-1.04.00
@@ -0,0 +1,3 @@
+MD5 d1a0363109d0188959ec35b7d6ebfb67 cluster-1.04.00.tar.gz 1663798
+RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 cluster-1.04.00.tar.gz 1663798
+SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 cluster-1.04.00.tar.gz 1663798
diff --git a/sys-cluster/magma-plugins/magma-plugins-1.02.00-r1.ebuild b/sys-cluster/magma-plugins/magma-plugins-1.02.00-r1.ebuild
index b6920cd97aab..d9a3f6d6f43d 100644
--- a/sys-cluster/magma-plugins/magma-plugins-1.02.00-r1.ebuild
+++ b/sys-cluster/magma-plugins/magma-plugins-1.02.00-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma-plugins/magma-plugins-1.02.00-r1.ebuild,v 1.4 2006/10/15 13:26:06 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma-plugins/magma-plugins-1.02.00-r1.ebuild,v 1.5 2007/03/09 11:15:04 xmerlin Exp $
 
 inherit eutils
 
+CLUSTER_RELEASE="1.02.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 CVS_RELEASE="20060713"
-MY_P="cluster-${PV}"
 
 DESCRIPTION="Magma cluster interface plugins"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -19,12 +20,14 @@ KEYWORDS="~amd64 ~ppc x86"
 #IUSE="nogulm"
 IUSE=""
 
-DEPEND=">=sys-cluster/magma-1.02.00-r1
-	>=sys-cluster/dlm-1.02.00-r1
-	>=sys-cluster/cman-1.02.00-r1
+DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
+	=sys-cluster/dlm-${CLUSTER_RELEASE}*
+	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*
 	"
 
-#	!nogulm? ( >=sys-cluster/gulm-1.02.00-r1 )"
+RDEPEND=""
+
+#	!nogulm? ( >=sys-cluster/gulm-${CLUSTER_RELEASE}* )"
 
 
 S="${WORKDIR}/${MY_P}/${PN}"
diff --git a/sys-cluster/magma-plugins/magma-plugins-1.03.00.ebuild b/sys-cluster/magma-plugins/magma-plugins-1.03.00.ebuild
index 9106399525e0..0976cccab3fc 100644
--- a/sys-cluster/magma-plugins/magma-plugins-1.03.00.ebuild
+++ b/sys-cluster/magma-plugins/magma-plugins-1.03.00.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma-plugins/magma-plugins-1.03.00.ebuild,v 1.3 2006/10/15 13:26:06 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma-plugins/magma-plugins-1.03.00.ebuild,v 1.4 2007/03/09 11:15:04 xmerlin Exp $
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.03.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="Magma cluster interface plugins"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -14,12 +15,12 @@ KEYWORDS="~amd64 ~ppc ~x86"
 #IUSE="nogulm"
 IUSE=""
 
-DEPEND=">=sys-cluster/magma-1.03.00
-	>=sys-cluster/dlm-1.03.00
-	>=sys-cluster/cman-1.03.00
+DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
+	=sys-cluster/dlm-${CLUSTER_RELEASE}*
+	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*
 	"
 
-#	!nogulm? ( >=sys-cluster/gulm-1.03.00 )"
+#	!nogulm? ( >=sys-cluster/gulm-${CLUSTER_RELEASE}* )"
 
 
 S="${WORKDIR}/${MY_P}/${PN}"
diff --git a/sys-cluster/magma-plugins/magma-plugins-1.04.00.ebuild b/sys-cluster/magma-plugins/magma-plugins-1.04.00.ebuild
new file mode 100644
index 000000000000..73497cceaf07
--- /dev/null
+++ b/sys-cluster/magma-plugins/magma-plugins-1.04.00.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma-plugins/magma-plugins-1.04.00.ebuild,v 1.1 2007/03/09 11:15:04 xmerlin Exp $
+
+CLUSTER_RELEASE="1.04.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+DESCRIPTION="Magma cluster interface plugins"
+HOMEPAGE="http://sources.redhat.com/cluster/"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+#IUSE="nogulm"
+IUSE=""
+
+DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
+	=sys-cluster/dlm-${CLUSTER_RELEASE}*
+	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*
+	"
+
+#	!nogulm? ( >=sys-cluster/gulm-${CLUSTER_RELEASE}* )"
+
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+src_compile() {
+	./configure || die "configure problem"
+
+	for i in cman dumb sm; do
+		emake -C ${i} all || die "compile problem"
+	done
+#	use nogulm || emake -C gulm all
+}
+
+src_install() {
+	for i in cman dumb sm; do
+		make -C ${i} DESTDIR=${D} install || die "install problem"
+	done
+#	use nogulm || make -C gulm DESTDIR=${D} install || die
+}