8 files changed, 61 insertions, 66 deletions
diff --git a/sys-cluster/gulm/ChangeLog b/sys-cluster/gulm/ChangeLog
index 51ea4dec31c9..8e81ec90d8ce 100644
--- a/sys-cluster/gulm/ChangeLog
+++ b/sys-cluster/gulm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/gulm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gulm/ChangeLog,v 1.3 2005/03/19 16:12:41 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gulm/ChangeLog,v 1.4 2005/09/05 22:01:03 xmerlin Exp $
+
+*gulm-1.00.00 (30 Jun 2005)
+
+  30 Jun 2005; Christian Zoffoli <xmerlin@gentoo.org> +gulm-1.00.00.ebuild,
+  -gulm-1.0_pre2.ebuild, -gulm-1.0_pre25.ebuild:
+  1.00.00 tree in portage. Removed old ebuilds, gulm needs an init.
 
 *gulm-1.0_pre25 (19 Mar 2005)
 
diff --git a/sys-cluster/gulm/Manifest b/sys-cluster/gulm/Manifest
index 7d44c2a63aa1..9625cfbbcdce 100644
--- a/sys-cluster/gulm/Manifest
+++ b/sys-cluster/gulm/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 64dfca92f12cccdc1afa55507c6a7b40 gulm-1.0_pre2.ebuild 805
-MD5 2b3bc22394e4c7198755bd8c605de2dd ChangeLog 552
+MD5 8ece4d5c0216e368c049de172b2bb1e6 ChangeLog 755
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
-MD5 71b8aff0ec80f8d588aeb5540994f2ce gulm-1.0_pre25.ebuild 931
-MD5 838b24dbd62ada6732e349b7350e46ce files/digest-gulm-1.0_pre2 65
-MD5 d50f2549158cf3fd36eee95f0e1ca6f9 files/digest-gulm-1.0_pre25 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCPJ1ogMUyd/cdjWsRAvWJAJ9c5cgR9U1hxVr4CtrpZxKvtd8xlwCeL1GR
-DmA7oPJvDUlrpPFpggPk4SI=
-=AHSg
------END PGP SIGNATURE-----
+MD5 b88215171aabfd52d2acfa30aaffaa54 gulm-1.00.00.ebuild 869
+MD5 3c7c9af7d7180c7befa962b52298e35a files/gulm.rc 878
+MD5 4f2d164091c3df995eb6cd31f2347a68 files/digest-gulm-1.00.00 68
diff --git a/sys-cluster/gulm/files/digest-gulm-1.00.00 b/sys-cluster/gulm/files/digest-gulm-1.00.00
new file mode 100644
index 000000000000..7b0e114fb607
--- /dev/null
+++ b/sys-cluster/gulm/files/digest-gulm-1.00.00
@@ -0,0 +1 @@
+MD5 49548be2d01d007e8e74d801a8a98f37 cluster-1.00.00.tar.gz 1329114
diff --git a/sys-cluster/gulm/files/digest-gulm-1.0_pre2 b/sys-cluster/gulm/files/digest-gulm-1.0_pre2
deleted file mode 100644
index fe70bd3cbbef..000000000000
--- a/sys-cluster/gulm/files/digest-gulm-1.0_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e31716b354dd62f77959a47cf7dedb0 gulm-1.0-pre2.tar.gz 157252
diff --git a/sys-cluster/gulm/files/digest-gulm-1.0_pre25 b/sys-cluster/gulm/files/digest-gulm-1.0_pre25
deleted file mode 100644
index a1fde3d5b9eb..000000000000
--- a/sys-cluster/gulm/files/digest-gulm-1.0_pre25
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a04880795183905571308a12e5c61a8 gulm-1.0-pre25.tar.gz 159363
diff --git a/sys-cluster/gulm/files/gulm.rc b/sys-cluster/gulm/files/gulm.rc
new file mode 100755
index 000000000000..0e39475706f8
--- /dev/null
+++ b/sys-cluster/gulm/files/gulm.rc
@@ -0,0 +1,43 @@
+#!/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/gulm/files/gulm.rc,v 1.1 2005/09/05 22:01:03 xmerlin Exp $
+
+depend() {
+	use net
+	need ccs
+	provide cluster-manager cluster-lock-manager
+}
+
+start() {
+#	if grep -qE "<[[:space:]]*gulm([[:space:]]|[>]|$)" /etc/cluster/cluster.conf
+#	then
+#		die "<gulm> section detected in /etc/cluster/cluster.conf"
+#	fi
+#
+#	ebegin "Loading cman module"
+#	modprobe cman
+#	eend $?
+#
+#	ebegin "Starting cman"
+#	/sbin/cman_tool -t ${CMAN_CLUSTER_TIMEOUT} \
+#		-w join ${CMAN_JOIN_OPTS}
+#	eend $?
+#	
+#	# make sure that we are quorate?  
+#	if [ ${CMAN_QUORUM_TIMEOUT} -gt 0 ]
+#	then
+#		/sbin/cman_tool -t ${CMAN_QUORUM_TIMEOUT} -q wait
+#	fi
+}
+
+stop() {
+#	ebegin "Stopping cman"
+#	/sbin/cman_tool -t ${CMAN_SHUTDOWN_TIMEOUT} -w leave > /dev/null
+#	eend $?
+#	
+#	ebegin "Removing cman module"
+# 	modprobe -r cman
+#	eend $?
+}
+
diff --git a/sys-cluster/gulm/gulm-1.0_pre25.ebuild b/sys-cluster/gulm/gulm-1.00.00.ebuild
index 09de4e666a2e..4d16a72da5fb 100644
--- a/sys-cluster/gulm/gulm-1.0_pre25.ebuild
+++ b/sys-cluster/gulm/gulm-1.00.00.ebuild
@@ -1,18 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gulm/gulm-1.0_pre25.ebuild,v 1.2 2005/03/19 21:39:56 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gulm/gulm-1.00.00.ebuild,v 1.1 2005/09/05 22:01:03 xmerlin Exp $
 
 inherit linux-mod
 
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
+CLUSTER_VERSION="1.00.00"
 DESCRIPTION="Redundant server-based cluster and lock manager for GFS"
 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"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/cluster-${CLUSTER_VERSION}.tar.gz"
 
 IUSE=""
 
@@ -21,15 +16,15 @@ SLOT="0"
 KEYWORDS="~x86"
 
 
-DEPEND=">=sys-cluster/ccs-0.24
-	>=sys-cluster/cman-1.0_pre31
+DEPEND=">=sys-cluster/ccs-1.00.00
+	>=sys-cluster/cman-1.00.00
 	sys-apps/tcp-wrappers
 	"
 
 RDEPEND="sys-apps/tcp-wrappers"
 
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/cluster-${CLUSTER_VERSION}/${PN}"
 
 src_compile() {
 	./configure --kernel_src=/usr/src/linux || die
diff --git a/sys-cluster/gulm/gulm-1.0_pre2.ebuild b/sys-cluster/gulm/gulm-1.0_pre2.ebuild
deleted file mode 100644
index 7fa675164683..000000000000
--- a/sys-cluster/gulm/gulm-1.0_pre2.ebuild
+++ /dev/null
@@ -1,37 +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/gulm/gulm-1.0_pre2.ebuild,v 1.3 2005/01/27 18:19:33 xmerlin Exp $
-
-inherit eutils linux-mod
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Redundant server-based cluster and lock manager for GFS"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="http://people.redhat.com/cfeist/cluster/tgz/${MY_P}.tar.gz"
-IUSE=""
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-
-
-DEPEND=">=sys-cluster/ccs-0.7
-	>=sys-cluster/cman-1.0_pre3
-	sys-apps/tcp-wrappers
-	"
-
-RDEPEND="sys-apps/tcp-wrappers"
-
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	./configure --kernel_src=/usr/src/linux || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}