Fix init script wrt 330035. Thanks to Denis Kaganovich <mahatma@bspu.unibel.by>. Correct dependencies, add use flag for ipmi. Thanks to Francisco Javier <ffelix@inode64.com>. Drop old.

(Portage version: 2.2_rc88/cvs/Linux x86_64)

3 files changed, 27 insertions, 16 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index e1b7b2bddc4e..a00f305d3bee 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.86 2010/10/06 07:13:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.87 2010/10/06 09:25:37 xarthisius Exp $
+
+*heartbeat-3.0.3-r2 (06 Oct 2010)
+
+  06 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -heartbeat-3.0.3-r1.ebuild, +heartbeat-3.0.3-r2.ebuild, metadata.xml:
+  Fix init script wrt 330035. Thanks to Denis Kaganovich
+  <mahatma@bspu.unibel.by>. Correct dependencies, add use flag for ipmi.
+  Thanks to Francisco Javier <ffelix@inode64.com>. Drop old.
 
 *heartbeat-3.0.3-r1 (06 Oct 2010)
 
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.3-r1.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.3-r2.ebuild
index 707ae8d74310..538f72285956 100644
--- a/sys-cluster/heartbeat/heartbeat-3.0.3-r1.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-3.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.3-r1.ebuild,v 1.1 2010/10/06 07:13:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.3-r2.ebuild,v 1.1 2010/10/06 09:25:37 xarthisius Exp $
 
 EAPI="2"
 
@@ -14,21 +14,21 @@ SRC_URI="http://hg.linux-ha.org/${PN}-STABLE_3_0/archive/STABLE-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc snmp static-libs"
+IUSE="doc ipmi snmp static-libs"
 
-RDEPEND="
-	sys-cluster/cluster-glue
+RDEPEND="sys-cluster/cluster-glue
 	dev-libs/glib:2
 	virtual/ssh
 	net-libs/gnutls
-	snmp? ( net-analyzer/net-snmp )
-	dev-lang/swig
-	"
+	ipmi? ( sys-libs/openipmi )
+	snmp? ( net-analyzer/net-snmp )	"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	dev-lang/swig"
+
 PDEPEND="sys-cluster/resource-agents"
 
-S="${WORKDIR}/Heartbeat-3-0-STABLE-${PV}"
+S=${WORKDIR}/Heartbeat-3-0-STABLE-${PV}
 
 PATCHES=(
 	"${FILESDIR}/${PV}-fix_configure.patch"
@@ -44,6 +44,12 @@ pkg_setup() {
 src_prepare() {
 	base_src_prepare
 	eautoreconf
+
+	cp "${FILESDIR}"/heartbeat-init "${T}" || die
+	sed -i \
+		-e "/ResourceManager/ s/lib/share/" \
+		-e "s:lib:$(get_libdir):g" \
+		"${T}"/heartbeat-init || die
 }
 
 src_configure() {
@@ -54,7 +60,7 @@ src_configure() {
 		$(use_enable doc) \
 		--disable-tipc \
 		--enable-libnet \
-		--enable-ipmilan \
+		$(use_enable ipmi ipmilan) \
 		--enable-dopd \
 		--libdir=/usr/$(get_libdir) \
 		--localstatedir=/var \
@@ -65,10 +71,6 @@ src_configure() {
 src_install() {
 	base_src_install
 
-	cp "${FILESDIR}"/heartbeat-init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-init" || die
 	newinitd "${T}/heartbeat-init" heartbeat || die
 
 	# fix collisions
diff --git a/sys-cluster/heartbeat/metadata.xml b/sys-cluster/heartbeat/metadata.xml
index 36db2995245c..ad3dea8976af 100644
--- a/sys-cluster/heartbeat/metadata.xml
+++ b/sys-cluster/heartbeat/metadata.xml
@@ -9,6 +9,7 @@
   <use>
   	<flag name='ldirectord'>Adds support for ldiretord, use enabled because it
 	has a lot of deps</flag>
-  	<flag name='management'>Adds support for management GUI.</flag>
+  	<flag name='management'>Adds support for management GUI</flag>
+	<flag name='ipmi'>Enable IPMILan Stonith Plugin</flag>
   </use>
 </pkgmetadata>