Ebuild cleanup, version bump.

(Portage version: 2.1.4.4)

9 files changed, 16 insertions, 393 deletions

diff --git a/sys-cluster/rgmanager/ChangeLog b/sys-cluster/rgmanager/ChangeLog
index 14139215f2ea..d626e47f22d7 100644
--- a/sys-cluster/rgmanager/ChangeLog
+++ b/sys-cluster/rgmanager/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/rgmanager
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/ChangeLog,v 1.9 2008/03/23 17:20:51 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/ChangeLog,v 1.10 2008/11/13 19:14:54 xmerlin Exp $
+
+*rgmanager-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -files/rgmanager-1.0x.conf, -files/rgmanager-1.0x.rc,
+  -files/rgmanager-1.02.00-20060713-cvs-clunfslock.patch,
+  -rgmanager-1.02.00-r1.ebuild, -rgmanager-1.03.00.ebuild,
+  -rgmanager-1.04.00.ebuild, -rgmanager-2.02.00.ebuild,
+  -rgmanager-2.02.00-r1.ebuild, +rgmanager-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
 
 *rgmanager-2.02.00-r1 (23 Mar 2008)
 
diff --git a/sys-cluster/rgmanager/files/rgmanager-1.02.00-20060713-cvs-clunfslock.patch b/sys-cluster/rgmanager/files/rgmanager-1.02.00-20060713-cvs-clunfslock.patch
deleted file mode 100644
index 78936c912f9c..000000000000
--- a/sys-cluster/rgmanager/files/rgmanager-1.02.00-20060713-cvs-clunfslock.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -uNr src/utils/clunfslock.sh.orig src/utils/clunfslock.sh
---- src/utils/clunfslock.sh.orig	1970-01-01 01:00:00.000000000 +0100
-+++ src/utils/clunfslock.sh	2006-07-14 15:37:27.000000000 +0200
-@@ -0,0 +1,74 @@
-+#!/bin/bash
-+#
-+# (C) 2006 Red Hat, Inc. 
-+#
-+# Licensed under the GNU General Public License, Version 2.
-+#
-+# rpc.statd -H $0 to enable.  This provides the HA-callout capability
-+# for RHCS-managed NFS services.  Note that you must edit
-+# /etc/sysconfig/nfs in order to make this work; clumanager/rgmanager
-+# will not interfere with a running nfs statd.
-+#
-+# Arg 3 (server as known to client) does not work; it's always 127.0.0.1
-+# so we traverse all cluster mount points.
-+#
-+
-+clustered_mounts()
-+{
-+	declare dev mp
-+
-+	while read dev mp; do
-+		if [ "${dev:0:4}" != "/dev" ]; then
-+			continue
-+		fi
-+
-+		# XXX Need clumanager to create this on mount
-+		if [ -d "$mp/.clumanager" ]; then
-+			echo $dev $mp
-+		fi
-+	done < <(cat /proc/mounts | awk '{print $1,$2}')
-+}
-+
-+
-+add-client()
-+{
-+	declare dev mp
-+
-+	while read dev mp; do
-+		[ -d "$mp/.clumanager/statd/sm" ] || \
-+			mkdir -p $mp/.clumanager/statd/sm
-+		touch $mp/.clumanager/statd/sm/$1
-+	done < <(clustered_mounts)
-+}
-+
-+
-+del-client()
-+{
-+	while read $dev $mp; do
-+		[ -d "$mp/.clumanager/statd/sm" ] || \
-+			mkdir -p $mp/.clumanager/statd/sm
-+		rm -f $mp/.clumanager/statd/sm/$1
-+	done < <(clustered_mounts)
-+}
-+
-+case "$1" in
-+	add-client)
-+		:
-+		;;
-+	del-client)
-+		:
-+		;;
-+	*)
-+		echo "Usage: $0 <add-client|del-client> <host> [server]"
-+		exit 0
-+esac
-+
-+
-+if [ -z "$2" ]; then
-+	echo "Usage: $0 <add-client|del-client> <host> [server]"
-+	exit 1
-+fi
-+
-+$1 $2 $3
-+exit 0
-+
diff --git a/sys-cluster/rgmanager/files/rgmanager-1.0x.conf b/sys-cluster/rgmanager/files/rgmanager-1.0x.conf
deleted file mode 100644
index 88de9e37b846..000000000000
--- a/sys-cluster/rgmanager/files/rgmanager-1.0x.conf
+++ /dev/null
@@ -1,5 +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/rgmanager/files/rgmanager-1.0x.conf,v 1.1 2008/03/17 17:14:00 xmerlin Exp $
-
-RGMGR_OPTS=""
diff --git a/sys-cluster/rgmanager/files/rgmanager-1.0x.rc b/sys-cluster/rgmanager/files/rgmanager-1.0x.rc
deleted file mode 100755
index b3b8c13d371f..000000000000
--- a/sys-cluster/rgmanager/files/rgmanager-1.0x.rc
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Adaption of the original RedHat script
-# Original Copyright (C) 2003 Red Hat, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/files/rgmanager-1.0x.rc,v 1.1 2008/03/17 17:14:00 xmerlin Exp $
-
-depend() {
-	use net
-	need ccs cluster-manager cluster-locking-manager
-}
-
-# We'd like a reload method as well
-opts="${opts} reload"
-
-ID="Cluster Resource Manager"
-RGMGRD=$(which clurgmgrd)
-RMTABD=$(which clurmtabd)
-CFG_FILE="/etc/cluster/cluster.conf"
-
-LOG_ERR=3
-LOG_WARNING=4
-LOG_NOTICE=5
-LOG_INFO=6
-
-#
-# If we're not configured, then don't start anything.
-#
-[ -f "$CFG_FILE" ] || exit 0
-
-
-#
-# log_and_print <level> <message>
-#
-function log_and_print()
-{
-	if [ -z "$1" -o -z "$2" ]; then
-		return 1;
-	fi
-
-	clulog -p $$ -n "rgmanager" -s $1 "$2"
-	echo $2
-
-	return 0;
-}
-
-
-#
-# Bring down the cluster on a node.
-#
-function stop_cluster()
-{
-	kill -TERM $(pidof $RGMGRD)
-
-	while [ 0 ]; do
-		if [ -n "`pidof $RGMGRD`" ]; then
-			while [ -n "`pidof $RGMGRD`" ]; do
-				sleep 1
-			done
-			einfo "Waiting for $(basename ${RGMGRD})"
-		else
-			eend "Services are stopped."
-		fi
-
-		# Ensure all NFS rmtab daemons are dead.
-		killall $(basename ${RMTABD}) &> /dev/null
-		
-		rm -f /var/run/$(basename ${RGMGRD}).pid
-
-		return 0
-	done
-}
-
-
-
-function start() {
-	ebegin "Starting cluster resource manager"
-	start-stop-daemon --start --quiet --exec ${RGMGRD} ${RGMGR_OPTS}
-	touch /var/lock/subsys/rgmanager
-	eend 
-}
-
-function restart() {
-	pidof ${RGMGRD} &> /dev/null
-	if [ ${?} -ne 1 ]; then
-		svc_stop
-	fi
-	svc_start
-}
-
-function reload() {
-	clulog -p ${LOG_NOTICE} "Reloading Resource Configuration."
-	ebegin "Reloading Resource Configuration "
-	kill -s HUP $(pidof ${RGMGRD} )
-	rv=${?}
-	eend
-	exit ${rv}
-}
-
-function stop() {
-	ebegin "Shutting down cluster resource manager"
-	if [ -n "$(pidof ${RGMGRD})" ]; then
-		stop_cluster
-	fi
-	rm -f /var/lock/subsys/rgmanager
-	eend
-}
diff --git a/sys-cluster/rgmanager/rgmanager-1.02.00-r1.ebuild b/sys-cluster/rgmanager/rgmanager-1.02.00-r1.ebuild
deleted file mode 100644
index b22e541f62d5..000000000000
--- a/sys-cluster/rgmanager/rgmanager-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,47 +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/rgmanager/rgmanager-1.02.00-r1.ebuild,v 1.6 2008/03/17 17:13:59 xmerlin Exp $
-
-inherit eutils
-
-CLUSTER_RELEASE="1.02.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-CVS_RELEASE="20060713"
-
-DESCRIPTION="Clustered resource group manager layered on top of Magma"
-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="x86 ~amd64"
-
-DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
-	=sys-cluster/magma-plugins-${CLUSTER_RELEASE}*
-	dev-libs/libxml2
-	"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${PN}-${PV}-${CVS_RELEASE}-cvs.patch || die
-	epatch "${FILESDIR}"/${PN}-${PV}-${CVS_RELEASE}-cvs-clunfslock.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
-}
diff --git a/sys-cluster/rgmanager/rgmanager-1.03.00.ebuild b/sys-cluster/rgmanager/rgmanager-1.03.00.ebuild
deleted file mode 100644
index 72599e5ce8d2..000000000000
--- a/sys-cluster/rgmanager/rgmanager-1.03.00.ebuild
+++ /dev/null
@@ -1,38 +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/rgmanager/rgmanager-1.03.00.ebuild,v 1.4 2008/03/17 17:13:59 xmerlin Exp $
-
-inherit eutils
-
-CLUSTER_RELEASE="1.03.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-CVS_RELEASE="20060713"
-
-DESCRIPTION="Clustered resource group manager layered on top of Magma"
-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="~x86 ~amd64"
-
-DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
-	=sys-cluster/magma-plugins-${CLUSTER_RELEASE}*
-	dev-libs/libxml2
-	"
-
-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}-1.0x.rc ${PN} || die
-	newconfd "${FILESDIR}"/${PN}-1.0x.conf ${PN} || die
-}
diff --git a/sys-cluster/rgmanager/rgmanager-1.04.00.ebuild b/sys-cluster/rgmanager/rgmanager-1.04.00.ebuild
deleted file mode 100644
index d585a02f3b50..000000000000
--- a/sys-cluster/rgmanager/rgmanager-1.04.00.ebuild
+++ /dev/null
@@ -1,38 +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/rgmanager/rgmanager-1.04.00.ebuild,v 1.2 2008/03/17 17:13:59 xmerlin Exp $
-
-inherit eutils
-
-CLUSTER_RELEASE="1.04.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-CVS_RELEASE="20060713"
-
-DESCRIPTION="Clustered resource group manager layered on top of Magma"
-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="~x86 ~amd64"
-
-DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
-	=sys-cluster/magma-plugins-${CLUSTER_RELEASE}*
-	dev-libs/libxml2
-	"
-
-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}-1.0x.rc ${PN} || die
-	newconfd "${FILESDIR}"/${PN}-1.0x.conf ${PN} || die
-}
diff --git a/sys-cluster/rgmanager/rgmanager-2.02.00-r1.ebuild b/sys-cluster/rgmanager/rgmanager-2.02.00-r1.ebuild
deleted file mode 100644
index be79ceff0c64..000000000000
--- a/sys-cluster/rgmanager/rgmanager-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/rgmanager/rgmanager-2.02.00-r1.ebuild,v 1.1 2008/03/23 17:20:51 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="Clustered resource group 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=""
-
-RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/dlm-lib-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-lib-${CLUSTER_RELEASE}*
-	"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	=sys-libs/slang-2*
-	"
-
-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
-
-	# There's a problem with -O2 right now, a patch was submitted.
-	env -u CFLAGS emake -j1 clean all || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die
-	newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die
-}
diff --git a/sys-cluster/rgmanager/rgmanager-2.02.00.ebuild b/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild
index fbd2102c3cbe..3ef84c0158db 100644
--- a/sys-cluster/rgmanager/rgmanager-2.02.00.ebuild
+++ b/sys-cluster/rgmanager/rgmanager-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/rgmanager/rgmanager-2.02.00.ebuild,v 1.1 2008/03/17 17:13:59 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild,v 1.1 2008/11/13 19:14:54 xmerlin Exp $
 
 inherit eutils versionator
 
@@ -11,7 +11,7 @@ MAJ_PV="$(get_major_version)"
 MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
 
 DESCRIPTION="Clustered resource group manager"
-HOMEPAGE="http://sources.redhat.com/cluster/"
+HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
 SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -23,6 +23,7 @@ RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
 	=sys-cluster/dlm-lib-${CLUSTER_RELEASE}*
 	=sys-cluster/cman-lib-${CLUSTER_RELEASE}*
 	"
+
 DEPEND="${RDEPEND}
 	dev-libs/libxml2
 	=sys-libs/slang-2*
@@ -36,8 +37,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" \
 			--dlmlibdir=/usr/lib \
 			--dlmincdir=/usr/include \
 			--cmanlibdir=/usr/lib \