Version bump along with new Cluster Suite deployment.

(Portage version: 2.1.10.14/cvs/Linux x86_64)

5 files changed, 138 insertions, 1 deletions

diff --git a/sys-cluster/rgmanager/ChangeLog b/sys-cluster/rgmanager/ChangeLog
index 90fc77c9ca57..dacfbc769999 100644
--- a/sys-cluster/rgmanager/ChangeLog
+++ b/sys-cluster/rgmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/rgmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/ChangeLog,v 1.18 2011/05/17 07:52:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/ChangeLog,v 1.19 2011/09/14 10:47:36 ultrabug Exp $
+
+*rgmanager-3.1.5 (14 Sep 2011)
+
+  14 Sep 2011; Ultrabug <ultrabug@gentoo.org> +rgmanager-3.1.5.ebuild,
+  +files/rgmanager-3.1.5-fix_libxml2.patch, +files/rgmanager.confd,
+  +files/rgmanager.initd:
+  Version bump along with new Cluster Suite deployment.
 
   17 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   rgmanager-2.03.09-r1.ebuild:
diff --git a/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch b/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch
new file mode 100644
index 000000000000..eff23ef495bc
--- /dev/null
+++ b/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch
@@ -0,0 +1,23 @@
+* Use double underline as header-protectors to avoid collision with icu's platform.h 
+* (pulled in via libxml2 when built with icu support) resulting in int64_t defined twice 
+* (once in icu's ptypes.h and once in stdint.h)
+* patch by Tiziano Mueller <dev-zero@gentoo.org>
+--- a/rgmanager/include/platform.h	2011-03-07 19:58:22.000000000 +0100
++++ b/rgmanager/include/platform.h	2011-03-08 15:59:36.773871936 +0100
+@@ -1,8 +1,8 @@
+ /** @file
+  * Defines for byte-swapping
+  */
+-#ifndef _PLATFORM_H
+-#define _PLATFORM_H
++#ifndef __PLATFORM_H
++#define __PLATFORM_H
+ 
+ #include <endian.h>
+ #include <sys/param.h>
+@@ -56,4 +56,4 @@
+ #define PACKED __attribute__((packed))
+ #endif
+ 
+-#endif /* _PLATFORM_H */
++#endif /* __PLATFORM_H */
diff --git a/sys-cluster/rgmanager/files/rgmanager.confd b/sys-cluster/rgmanager/files/rgmanager.confd
new file mode 100644
index 000000000000..cad0c51bd590
--- /dev/null
+++ b/sys-cluster/rgmanager/files/rgmanager.confd
@@ -0,0 +1,8 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/files/rgmanager.confd,v 1.1 2011/09/14 10:47:36 ultrabug Exp $
+
+PIDFILE="/var/run/rgmanager.pid"
+
+RGMGR_OPTS=""
+
diff --git a/sys-cluster/rgmanager/files/rgmanager.initd b/sys-cluster/rgmanager/files/rgmanager.initd
new file mode 100644
index 000000000000..2e3d25cf595d
--- /dev/null
+++ b/sys-cluster/rgmanager/files/rgmanager.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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.initd,v 1.1 2011/09/14 10:47:36 ultrabug Exp $
+
+depend() {
+	use net
+#	need cman
+}
+
+start() {
+	ebegin "Starting cluster resource manager"
+
+	# recreate run-directory
+	mkdir -p /var/run/cluster
+
+	start-stop-daemon \
+		--start \
+		--quiet \
+		--exec "/usr/sbin/rgmanager" \
+		--pidfile "${PIDFILE}" \
+		-- ${RGMGR_OPTS}
+	eend $ret
+}
+
+stop() {
+	ebegin "Shutting down cluster resource manager"
+	start-stop-daemon \
+		--stop \
+		--pidfile "${PIDFILE}" \
+		--retry 0
+	eend $?
+}
diff --git a/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
new file mode 100644
index 000000000000..fa575128dac6
--- /dev/null
+++ b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild,v 1.1 2011/09/14 10:47:36 ultrabug Exp $
+
+EAPI=4
+
+inherit eutils multilib versionator
+
+CLUSTER_RELEASE="${PV}"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+MAJ_PV="$(get_major_version)"
+MIN_PV="$(get_version_component_range 2-3)"
+
+DESCRIPTION="Clustered resource group manager"
+HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
+SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+DEPEND="~sys-cluster/libcman-${PV}
+	~sys-cluster/liblogthread-${PV}
+	~sys-cluster/libccs-${PV}
+	~sys-cluster/libdlm-${PV}
+	dev-libs/libxml2
+	=sys-libs/slang-2*
+	dbus? ( sys-apps/dbus )"
+RDEPEND="${DEPEND}
+	~sys-cluster/cman-${PV}"
+
+S=${WORKDIR}/${MY_P}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix_libxml2.patch"
+}
+
+src_configure() {
+	local myopts=""
+	use dbus || myopts="--disable_dbus"
+	cd "${WORKDIR}"/${MY_P}
+	./configure \
+		--cc="$(tc-getCC)" \
+		--cflags="-Wall" \
+		--libdir=/usr/$(get_libdir) \
+		--disable_kernel_check \
+		--somajor="$MAJ_PV" \
+		--sominor="$MIN_PV" \
+		--dlmlibdir=/usr/$(get_libdir) \
+		--dlmincdir=/usr/include \
+		--cmanlibdir=/usr/$(get_libdir) \
+		--cmanincdir=/usr/include \
+		${myopts} \
+		|| die "configure problem"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}