15 files changed, 171 insertions, 51 deletions
diff --git a/sys-cluster/gnbd-headers/ChangeLog b/sys-cluster/gnbd-headers/ChangeLog
index d4770803f56d..d41b8c63eb2c 100644
--- a/sys-cluster/gnbd-headers/ChangeLog
+++ b/sys-cluster/gnbd-headers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/gnbd-headers
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-headers/ChangeLog,v 1.3 2005/09/05 04:04:57 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-headers/ChangeLog,v 1.4 2005/10/08 15:48:46 xmerlin Exp $
+
+*gnbd-headers-1.01.00 (08 Oct 2005)
+
+  08 Oct 2005; Christian Zoffoli <xmerlin@gentoo.org>
+  gnbd-headers-1.00.00.ebuild, +gnbd-headers-1.01.00.ebuild:
+  ebuild cleanup. New version.
 
   05 Sep 2005; Christian Zoffoli <xmerlin@gentoo.org>
   gnbd-headers-1.00.00.ebuild:
diff --git a/sys-cluster/gnbd-headers/Manifest b/sys-cluster/gnbd-headers/Manifest
index 821d350ad263..a6ddea07c920 100644
--- a/sys-cluster/gnbd-headers/Manifest
+++ b/sys-cluster/gnbd-headers/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2ba2b57fe7d2958b9cc683aef6e92557 ChangeLog 614
-MD5 4f2d164091c3df995eb6cd31f2347a68 files/digest-gnbd-headers-1.00.00 68
-MD5 3a2a5ab262c7f2f33982259bc59dcd7d gnbd-headers-1.00.00.ebuild 747
+MD5 c601972e0d68fa4691f8e3b1cc151f30 ChangeLog 798
+MD5 9a2e49010d7b17e25235970e6cb03c05 gnbd-headers-1.00.00.ebuild 705
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDHEdlI1lqEGTUzyQRAsV5AJ9YOOArCBFEG+csDTQrKag8S1ckOgCgmEO8
-FGuHfvp9R5A13IEDqDtIjvQ=
-=R5uD
------END PGP SIGNATURE-----
+MD5 4a1a8f3fd2ffa4c27c9fac1ef556c28c gnbd-headers-1.01.00.ebuild 705
+MD5 4f2d164091c3df995eb6cd31f2347a68 files/digest-gnbd-headers-1.00.00 68
+MD5 9d2b25c988a934245d5ef85edcf067d8 files/digest-gnbd-headers-1.01.00 68
diff --git a/sys-cluster/gnbd-headers/files/digest-gnbd-headers-1.01.00 b/sys-cluster/gnbd-headers/files/digest-gnbd-headers-1.01.00
new file mode 100644
index 000000000000..01881d35db4a
--- /dev/null
+++ b/sys-cluster/gnbd-headers/files/digest-gnbd-headers-1.01.00
@@ -0,0 +1 @@
+MD5 e98551b02ee8ed46ae0ab8fca193d751 cluster-1.01.00.tar.gz 1321031
diff --git a/sys-cluster/gnbd-headers/gnbd-headers-1.00.00.ebuild b/sys-cluster/gnbd-headers/gnbd-headers-1.00.00.ebuild
index 4dd832bfee77..a34a59fa6e27 100644
--- a/sys-cluster/gnbd-headers/gnbd-headers-1.00.00.ebuild
+++ b/sys-cluster/gnbd-headers/gnbd-headers-1.00.00.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2005 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.00.00.ebuild,v 1.4 2005/09/05 13:25:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-headers/gnbd-headers-1.00.00.ebuild,v 1.5 2005/10/08 15:48:46 xmerlin Exp $
+
+MY_P="cluster-${PV}"
 
-CLUSTER_VERSION="1.00.00"
 DESCRIPTION="GFS Network Block Devices headers"
 HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/cluster-${CLUSTER_VERSION}.tar.gz"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,7 +16,7 @@ IUSE=""
 DEPEND="!<=sys-cluster/gnbd-kernel-1.00.00"
 RDEPEND=""
 
-S="${WORKDIR}/cluster-${CLUSTER_VERSION}/${PN/headers/kernel}"
+S="${WORKDIR}/${MY_P}/${PN/headers/kernel}"
 
 src_compile() {
 	einfo "No compilation necessary"
diff --git a/sys-cluster/gnbd-headers/gnbd-headers-1.01.00.ebuild b/sys-cluster/gnbd-headers/gnbd-headers-1.01.00.ebuild
new file mode 100644
index 000000000000..70f48e14ec04
--- /dev/null
+++ b/sys-cluster/gnbd-headers/gnbd-headers-1.01.00.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2005 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.01.00.ebuild,v 1.1 2005/10/08 15:48:46 xmerlin Exp $
+
+MY_P="cluster-${PV}"
+
+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="~ppc ~x86"
+IUSE=""
+
+DEPEND="!<=sys-cluster/gnbd-kernel-1.01.00"
+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-kernel/ChangeLog b/sys-cluster/gnbd-kernel/ChangeLog
index 81de99c54d45..44379c72beab 100644
--- a/sys-cluster/gnbd-kernel/ChangeLog
+++ b/sys-cluster/gnbd-kernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/gnbd-kernel
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/ChangeLog,v 1.9 2005/09/05 20:39:51 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/ChangeLog,v 1.10 2005/10/08 15:52:02 xmerlin Exp $
+
+*gnbd-kernel-1.01.00 (08 Oct 2005)
+
+  08 Oct 2005; Christian Zoffoli <xmerlin@gentoo.org>
+  gnbd-kernel-1.00.00-r1.ebuild, +gnbd-kernel-1.01.00.ebuild:
+  ebuild cleanup. New version.
 
   05 Sep 2005; Danny van Dyk <kugelfang@gentoo.org>
   gnbd-kernel-1.00.00-r1.ebuild:
diff --git a/sys-cluster/gnbd-kernel/Manifest b/sys-cluster/gnbd-kernel/Manifest
index ce863b018149..04762388cea1 100644
--- a/sys-cluster/gnbd-kernel/Manifest
+++ b/sys-cluster/gnbd-kernel/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 253010406614e6e5f94edb670fadef2a ChangeLog 1460
-MD5 28e4679cb1ba6269c2a5008c1af36cc0 gnbd-kernel-1.00.00-r1.ebuild 1124
+MD5 2a4d3960c679e12d72bc42975fefb6da gnbd-kernel-1.00.00-r1.ebuild 1082
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
+MD5 2a4d3960c679e12d72bc42975fefb6da gnbd-kernel-1.01.00.ebuild 1082
 MD5 4f2d164091c3df995eb6cd31f2347a68 files/digest-gnbd-kernel-1.00.00-r1 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDHK/s5mJXAu5GbtIRAq3GAJ0RrXjprWc2BtxJJdrcKKudS4KFhQCdGDfb
-FMR+ckQXbtICLknfi1wUAHw=
-=2o/b
------END PGP SIGNATURE-----
+MD5 9d2b25c988a934245d5ef85edcf067d8 files/digest-gnbd-kernel-1.01.00 68
diff --git a/sys-cluster/gnbd-kernel/files/digest-gnbd-kernel-1.01.00 b/sys-cluster/gnbd-kernel/files/digest-gnbd-kernel-1.01.00
new file mode 100644
index 000000000000..01881d35db4a
--- /dev/null
+++ b/sys-cluster/gnbd-kernel/files/digest-gnbd-kernel-1.01.00
@@ -0,0 +1 @@
+MD5 e98551b02ee8ed46ae0ab8fca193d751 cluster-1.01.00.tar.gz 1321031
diff --git a/sys-cluster/gnbd-kernel/gnbd-kernel-1.00.00-r1.ebuild b/sys-cluster/gnbd-kernel/gnbd-kernel-1.00.00-r1.ebuild
index 540b9d933c3b..51626c4dd899 100644
--- a/sys-cluster/gnbd-kernel/gnbd-kernel-1.00.00-r1.ebuild
+++ b/sys-cluster/gnbd-kernel/gnbd-kernel-1.00.00-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.00.00-r1.ebuild,v 1.3 2005/09/05 20:39:51 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.00.00-r1.ebuild,v 1.4 2005/10/08 15:52:02 xmerlin Exp $
 
 inherit linux-mod
 
-CLUSTER_VERSION="1.00.00"
+MY_P="cluster-${PV}"
+
 DESCRIPTION="GFS Network Block Devices module"
 HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/cluster-${CLUSTER_VERSION}.tar.gz"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,7 +21,7 @@ DEPEND="|| (
 	)"
 RDEPEND=""
 
-S="${WORKDIR}/cluster-${CLUSTER_VERSION}/${PN}"
+S="${WORKDIR}/${MY_P}/${PN}"
 
 pkg_setup() {
 	if kernel_is 2 4; then
diff --git a/sys-cluster/gnbd-kernel/gnbd-kernel-1.01.00.ebuild b/sys-cluster/gnbd-kernel/gnbd-kernel-1.01.00.ebuild
new file mode 100644
index 000000000000..dfe861adf3ca
--- /dev/null
+++ b/sys-cluster/gnbd-kernel/gnbd-kernel-1.01.00.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.01.00.ebuild,v 1.1 2005/10/08 15:52:02 xmerlin Exp $
+
+inherit linux-mod
+
+MY_P="cluster-${PV}"
+
+DESCRIPTION="GFS Network Block Devices module"
+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-kernel/vanilla-sources-2.6.12
+		>=sys-kernel/gentoo-sources-2.6.12
+	)"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+pkg_setup() {
+	if kernel_is 2 4; then
+		die "${P} supports only 2.6 kernels"
+	fi
+}
+
+src_compile() {
+	check_KV
+	set_arch_to_kernel
+
+	./configure --kernel_src=${KERNEL_DIR} --verbose || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	rm -f ${D}/usr/include/linux/gnbd.h || die
+}
+
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo ""
+	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
+	einfo ""
+}
diff --git a/sys-cluster/gnbd/ChangeLog b/sys-cluster/gnbd/ChangeLog
index 55ead853d0f7..9eaeaaf588ea 100644
--- a/sys-cluster/gnbd/ChangeLog
+++ b/sys-cluster/gnbd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/gnbd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/ChangeLog,v 1.10 2005/10/07 19:48:57 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/ChangeLog,v 1.11 2005/10/08 15:53:06 xmerlin Exp $
+
+  08 Oct 2005; Christian Zoffoli <xmerlin@gentoo.org> gnbd-1.00.00-r1.ebuild:
+  ebuild cleanup. New version.
 
   07 Oct 2005; Christian Zoffoli <xmerlin@gentoo.org> +files/gnbd-client.conf,
   files/gnbd-client.rc, +files/gnbd-srv.conf, files/gnbd-srv.rc,
diff --git a/sys-cluster/gnbd/Manifest b/sys-cluster/gnbd/Manifest
index dc7f3ccd246d..2266ed8d67d3 100644
--- a/sys-cluster/gnbd/Manifest
+++ b/sys-cluster/gnbd/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c2b147975107452be07da9e5b5ab21ab ChangeLog 1851
+MD5 2ffc0163cc3931bcf69eea6f4d800547 ChangeLog 1961
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
-MD5 24fd2baa02ee93de45719958f1e24368 gnbd-1.00.00-r1.ebuild 1060
+MD5 41c7e6ea22cace51191c80a8da785ef1 gnbd-1.00.00-r1.ebuild 1018
+MD5 722bf802848c4783a1feb0539aace229 gnbd-1.01.00.ebuild 1018
 MD5 4fa6e5f8e0d5600e324cc3dda0273559 files/gnbd-client.rc 2745
 MD5 b62daccfc63de43c6e67333ff4eea04e files/gnbd-srv.rc 1967
 MD5 a96ced2be5dbc837a2d23bd3fbecaa12 files/gnbd.devfs 332
@@ -11,10 +9,4 @@ MD5 79b84f9fc4b7bdee59dd1211663aef8d files/gnbdtab 177
 MD5 4f2d164091c3df995eb6cd31f2347a68 files/digest-gnbd-1.00.00-r1 68
 MD5 a94865e8c419db5f9d2f455e61db1a49 files/gnbd-client.conf 243
 MD5 3347be217818ecf129f40e26a0e2bf75 files/gnbd-srv.conf 237
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDRtGYgMUyd/cdjWsRAqF1AKCL3QH+UiZ7igFoEwXSghmcYUBbrQCbBRyl
-3LDbYHGbvv2Sy79wRwQmO8w=
-=gT1H
------END PGP SIGNATURE-----
+MD5 9d2b25c988a934245d5ef85edcf067d8 files/digest-gnbd-1.01.00 68
diff --git a/sys-cluster/gnbd/files/digest-gnbd-1.01.00 b/sys-cluster/gnbd/files/digest-gnbd-1.01.00
new file mode 100644
index 000000000000..01881d35db4a
--- /dev/null
+++ b/sys-cluster/gnbd/files/digest-gnbd-1.01.00
@@ -0,0 +1 @@
+MD5 e98551b02ee8ed46ae0ab8fca193d751 cluster-1.01.00.tar.gz 1321031
diff --git a/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild b/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild
index b02c317dd5ca..4e3343ce0727 100644
--- a/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild
+++ b/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild,v 1.4 2005/10/07 19:48:57 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild,v 1.5 2005/10/08 15:53:06 xmerlin Exp $
+
+MY_P="cluster-${PV}"
 
-CLUSTER_VERSION="1.00.00"
 DESCRIPTION="GFS Network Block Devices"
 HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/cluster-${CLUSTER_VERSION}.tar.gz"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,7 +17,7 @@ DEPEND=">=sys-cluster/magma-1.00.00
 	>=sys-cluster/gnbd-headers-1.00.00"
 
 
-S="${WORKDIR}/cluster-${CLUSTER_VERSION}/${PN}"
+S="${WORKDIR}/${MY_P}/${PN}"
 
 src_compile() {
 	./configure || die
diff --git a/sys-cluster/gnbd/gnbd-1.01.00.ebuild b/sys-cluster/gnbd/gnbd-1.01.00.ebuild
new file mode 100644
index 000000000000..94ce8dc84634
--- /dev/null
+++ b/sys-cluster/gnbd/gnbd-1.01.00.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-1.01.00.ebuild,v 1.1 2005/10/08 15:53:06 xmerlin Exp $
+
+MY_P="cluster-${PV}"
+
+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="~ppc ~x86"
+IUSE=""
+
+DEPEND=">=sys-cluster/magma-1.01.00
+	>=sys-cluster/gnbd-headers-1.01.00"
+
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+src_compile() {
+	./configure || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	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
+}