7 files changed, 16 insertions, 71 deletions
diff --git a/sys-cluster/cman-kernel/ChangeLog b/sys-cluster/cman-kernel/ChangeLog
index d6136cb893c0..f17b73da6cf5 100644
--- a/sys-cluster/cman-kernel/ChangeLog
+++ b/sys-cluster/cman-kernel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/cman-kernel
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/ChangeLog,v 1.3 2005/03/19 15:41:01 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/ChangeLog,v 1.4 2005/06/30 13:17:02 xmerlin Exp $
+
+  30 Jun 2005; Christian Zoffoli <xmerlin@gentoo.org>
+  -cman-kernel-2.6.9-r1.ebuild, -cman-kernel-2.6.9.ebuild:
+  1.00.00 tree in portage. Removed old ebuilds.
 
 *cman-kernel-2.6.9-r1 (19 Mar 2005)
 
diff --git a/sys-cluster/cman-kernel/Manifest b/sys-cluster/cman-kernel/Manifest
index 1c651ff83b52..826ea888137b 100644
--- a/sys-cluster/cman-kernel/Manifest
+++ b/sys-cluster/cman-kernel/Manifest
@@ -1,6 +1,4 @@
-MD5 e50ea3515327cc97da68a62585459a7a ChangeLog 589
-MD5 0dfe9c89f0a153799dc3fb561093446c cman-kernel-2.6.9.ebuild 967
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
-MD5 5c49f43ac8443c33e5cbcdbb3fa00390 cman-kernel-2.6.9-r1.ebuild 1135
-MD5 5c41af38e284ea04ee2e304857a37652 files/digest-cman-kernel-2.6.9 71
-MD5 8c5b45f6742283c6d6c6fc8250c242f3 files/digest-cman-kernel-2.6.9-r1 72
+MD5 e1b58b9af473c714f6f78fc378020435 ChangeLog 751
+MD5 0712492ffc95a190ad8e0503f619c421 cman-kernel-1.00.00.ebuild 1057
+MD5 4f2d164091c3df995eb6cd31f2347a68 files/digest-cman-kernel-1.00.00 68
diff --git a/sys-cluster/cman-kernel/cman-kernel-2.6.9.ebuild b/sys-cluster/cman-kernel/cman-kernel-1.00.00.ebuild
index 7e06f545d10e..b92ccbf94184 100644
--- a/sys-cluster/cman-kernel/cman-kernel-2.6.9.ebuild
+++ b/sys-cluster/cman-kernel/cman-kernel-1.00.00.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/cman-kernel-2.6.9.ebuild,v 1.3 2005/03/09 17:48:20 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/cman-kernel-1.00.00.ebuild,v 1.1 2005/06/30 13:17:02 xmerlin Exp $
 
-inherit eutils linux-mod
-
-MY_PV="${PV}-0"
-MY_P="${PN}-${MY_PV}"
+inherit linux-mod
 
+CLUSTER_VERSION="1.00.00"
 DESCRIPTION="CMAN cluster kernel module"
 HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="http://people.redhat.com/cfeist/cluster/tgz/${MY_P}.tar.gz"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/cluster-${CLUSTER_VERSION}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
 IUSE=""
-DEPEND="virtual/linux-sources"
+#DEPEND=">=virtual/linux-sources-2.6.12"
+DEPEND=">=sys-kernel/vanilla-sources-2.6.12_rc1"
 RDEPEND=""
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/cluster-${CLUSTER_VERSION}/${PN}"
 
 pkg_setup() {
 	if kernel_is 2 4; then
diff --git a/sys-cluster/cman-kernel/cman-kernel-2.6.9-r1.ebuild b/sys-cluster/cman-kernel/cman-kernel-2.6.9-r1.ebuild
deleted file mode 100644
index 18d237ea86fb..000000000000
--- a/sys-cluster/cman-kernel/cman-kernel-2.6.9-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/cman-kernel-2.6.9-r1.ebuild,v 1.2 2005/03/20 02:53:13 mr_bones_ Exp $
-
-inherit linux-mod
-
-MY_PV="${PV}-29"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="CMAN cluster kernel module"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-#SRC_URI="http://people.redhat.com/cfeist/cluster/tgz/${MY_P}.tar.gz"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if kernel_is 2 4; then
-		die "${P} supports only 2.6 kernels"
-	else
-		if ! kernel_is 2 6 9; then
-			die "${P} needs a 2.6.9 kernel"
-		fi
-	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
-}
-
-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/cman-kernel/files/digest-cman-kernel-1.00.00 b/sys-cluster/cman-kernel/files/digest-cman-kernel-1.00.00
new file mode 100644
index 000000000000..7b0e114fb607
--- /dev/null
+++ b/sys-cluster/cman-kernel/files/digest-cman-kernel-1.00.00
@@ -0,0 +1 @@
+MD5 49548be2d01d007e8e74d801a8a98f37 cluster-1.00.00.tar.gz 1329114
diff --git a/sys-cluster/cman-kernel/files/digest-cman-kernel-2.6.9 b/sys-cluster/cman-kernel/files/digest-cman-kernel-2.6.9
deleted file mode 100644
index e3a168ebe339..000000000000
--- a/sys-cluster/cman-kernel/files/digest-cman-kernel-2.6.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4920110174dc852893d6ebadb6c79386 cman-kernel-2.6.9-0.tar.gz 268220
diff --git a/sys-cluster/cman-kernel/files/digest-cman-kernel-2.6.9-r1 b/sys-cluster/cman-kernel/files/digest-cman-kernel-2.6.9-r1
deleted file mode 100644
index 6de233126702..000000000000
--- a/sys-cluster/cman-kernel/files/digest-cman-kernel-2.6.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b96ddb76788397ec43c13cd870ee56e cman-kernel-2.6.9-29.tar.gz 180646