[gentoo-commits] gentoo-x86 commit in sys-cluster/heartbeat: metadata.xml ChangeLog heartbeat-3.0.3-r2.ebuild heartbeat-3.0.3-r1.ebuild

[Kacper Kowalik (xarthisius)]

xarthisius    10/10/06 09:25:37

  Modified:             metadata.xml ChangeLog
  Added:                heartbeat-3.0.3-r2.ebuild
  Removed:              heartbeat-3.0.3-r1.ebuild
  Log:
  Fix init script wrt 330035. Thanks to Denis Kaganovich <mahatma@×××××××××××.by>. Correct dependencies, add use flag for ipmi. Thanks to Francisco Javier <ffelix@×××××××.com>. Drop old.
  
  (Portage version: 2.2_rc88/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  sys-cluster/heartbeat/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/metadata.xml?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/metadata.xml?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/metadata.xml?r1=1.6&r2=1.7

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml	11 Sep 2010 14:21:31 -0000	1.6
+++ metadata.xml	6 Oct 2010 09:25:37 -0000	1.7
@@ -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>



1.87                 sys-cluster/heartbeat/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/ChangeLog?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/ChangeLog?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/ChangeLog?r1=1.86&r2=1.87

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- ChangeLog	6 Oct 2010 07:13:42 -0000	1.86
+++ ChangeLog	6 Oct 2010 09:25:37 -0000	1.87
@@ -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@g.o>
+  -heartbeat-3.0.3-r1.ebuild, +heartbeat-3.0.3-r2.ebuild, metadata.xml:
+  Fix init script wrt 330035. Thanks to Denis Kaganovich
+  <mahatma@×××××××××××.by>. Correct dependencies, add use flag for ipmi.
+  Thanks to Francisco Javier <ffelix@×××××××.com>. Drop old.
 
 *heartbeat-3.0.3-r1 (06 Oct 2010)
 



1.1                  sys-cluster/heartbeat/heartbeat-3.0.3-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.3-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.3-r2.ebuild?rev=1.1&content-type=text/plain

Index: heartbeat-3.0.3-r2.ebuild
===================================================================
# 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-r2.ebuild,v 1.1 2010/10/06 09:25:37 xarthisius Exp $

EAPI="2"

PYTHON_DEPEND="2"
inherit python autotools multilib eutils base

DESCRIPTION="Heartbeat high availability cluster manager"
HOMEPAGE="http://www.linux-ha.org/wiki/Heartbeat"
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 ipmi snmp static-libs"

RDEPEND="sys-cluster/cluster-glue
	dev-libs/glib:2
	virtual/ssh
	net-libs/gnutls
	ipmi? ( sys-libs/openipmi )
	snmp? ( net-analyzer/net-snmp )	"
DEPEND="${RDEPEND}
	dev-util/pkgconfig
	dev-lang/swig"

PDEPEND="sys-cluster/resource-agents"

S=${WORKDIR}/Heartbeat-3-0-STABLE-${PV}

PATCHES=(
	"${FILESDIR}/${PV}-fix_configure.patch"
	"${FILESDIR}/${PV}-docs.patch"
	"${FILESDIR}/${PV}-python_tests.patch"
)

pkg_setup() {
	python_set_active_version 2
	python_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() {
	econf \
		--disable-dependency-tracking \
		--disable-fatal-warnings \
		$(use_enable static-libs static) \
		$(use_enable doc) \
		--disable-tipc \
		--enable-libnet \
		$(use_enable ipmi ipmilan) \
		--enable-dopd \
		--libdir=/usr/$(get_libdir) \
		--localstatedir=/var \
		--docdir=/usr/share/doc/${PF} \
		$(use_enable snmp)
}

src_install() {
	base_src_install

	newinitd "${T}/heartbeat-init" heartbeat || die

	# fix collisions
	rm -rf "${D}"/usr/include/heartbeat/{compress,ha_msg}.h

	if use doc ; then
		dodoc README doc/*.txt doc/AUTHORS  || die
	fi
}