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.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

4 files changed, 30 insertions, 19 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/Manifest b/sys-cluster/heartbeat/Manifest
index 29914ef00c4b..5554e21a2ccc 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -17,6 +17,6 @@ EBUILD heartbeat-1.2.5-r1.ebuild 2036 RMD160 336e598ab184b9c95b24e245335f953c165
 EBUILD heartbeat-1.2.5.ebuild 1986 RMD160 c42f9d01c43438c765bf4ef878d15cd1bbc39e0f SHA1 51b01db70e00ff119522f98df1548ef2045729e1 SHA256 0e8cf23a0b470931879f48ec67f30a4b36dd51802165f2e868cbcbd2bf56dcde
 EBUILD heartbeat-2.0.7-r2.ebuild 3565 RMD160 2275d514ffee4b55d200316f5dcb67221f11061c SHA1 d728b403714f8344a8e4b87eff07865563b75aba SHA256 6f8523742df6c27727fc36965e5a174ccb9a7c190f524aae37f40426f58bf6a3
 EBUILD heartbeat-2.0.8.ebuild 4035 RMD160 1828b6c0de4e1fda13f037b6d86792c0485154d1 SHA1 e4e5a1ad935ea53aff839ea9193ca7446928c5b2 SHA256 8a97133b27731a90d55d436dc7c260ec5b2b51910c5e1ae7de7bdbbd51c1628e
-EBUILD heartbeat-3.0.3-r1.ebuild 1767 RMD160 a0d81b0da8b1b3e91b9248be6a1d6db00717d20b SHA1 56b156aaf477bf8b1378f68dcc99e7d8fd5cbe7d SHA256 efececad96968db0f9ce93ca5cc5e7780d7371eaa60a539c111dc97ec4f0a3cc
-MISC ChangeLog 14003 RMD160 dee2c05a02a5457f3148d21510424f88b1973a1e SHA1 4e2855f7d8bd08b07a5ee5a8f8a610181686bc7e SHA256 a0d3f90417efe9dd854298e17ca0524c498be32441799d3531e8e19f390a9d05
-MISC metadata.xml 460 RMD160 ef7a67fe75887ae13fe288451da30552862c73f7 SHA1 41b1118cc0db93bea86ac38c6473f712865ec852 SHA256 c419d23cb196d96513b7593eb30748d8fd52e891add16b7396a458792205d870
+EBUILD heartbeat-3.0.3-r2.ebuild 1843 RMD160 3ad89ddf29ec76b2523ea3d2f7106b320dfee41f SHA1 9c5bd9e6fc1c1a4632d10194e11403f1c8681572 SHA256 5ce5c9348712794b2ba7a02049c580798d5bf983e48b5672281f04577a4acffc
+MISC ChangeLog 14356 RMD160 469d3f9e0bd92329227e195d403b135a6e71533d SHA1 1cad96d50f1b054b2b704a650392a150fedc643a SHA256 1d7713b67845e9c2d23f63461d50b212bda28b2bfc4b83249751b003f1e3a303
+MISC metadata.xml 515 RMD160 da301d1cae0399b79bb38822ad9637f6c8029a90 SHA1 a883f5f9f4f5a1d70ab7dba7c6846ad13b12b031 SHA256 b944e73c810b448940f997ac1cd393bb75d7c6b68d03231c34754e9bf6878ca5
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>