Version bump.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 278 insertions, 2 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index 6a19ae44dedf..f5dce8791cf8 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/heartbeat
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.81 2009/11/18 17:36:35 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.82 2010/06/21 14:35:33 xarthisius Exp $
+
+*heartbeat-3.0.3 (21 Jun 2010)
+
+  21 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/3.0.3-docs.patch, +files/3.0.3-fix_configure.patch,
+  +files/3.0.3-python_tests.patch, +heartbeat-3.0.3.ebuild:
+  Version bump.
 
   18 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
   heartbeat-2.0.8.ebuild, +files/heartbeat-2.0.8-asneeded.patch:
diff --git a/sys-cluster/heartbeat/files/3.0.3-docs.patch b/sys-cluster/heartbeat/files/3.0.3-docs.patch
new file mode 100644
index 000000000000..3fdcfbda58ff
--- /dev/null
+++ b/sys-cluster/heartbeat/files/3.0.3-docs.patch
@@ -0,0 +1,57 @@
+--- configure.in
++++ configure.in
+@@ -505,8 +505,15 @@
+ AC_PATH_PROGS(TEST, test)
+ AC_PATH_PROGS(PKGCONFIG, pkg-config)
+ 
+-dnl xsltproc is required for building the man pages
+-AC_PATH_PROGS(XSLTPROC, xsltproc)
++AC_ARG_ENABLE([doc],
++	AS_HELP_STRING([--enable-doc],[Build documentation]
++))
++AS_IF([test "x$enable_doc" = "xyes"], [
++	AC_PATH_PROGS(XSLTPROC, xsltproc)
++])
++AM_CONDITIONAL([BUILD_DOC], [test "x$enable_doc" = "xyes"] )
++AC_SUBST(XSLTPROC)
++
+ 
+ dnl ************************************************************************
+ dnl Check whether non-root user can chown.
+--- doc/Makefile.am
++++ doc/Makefile.am
+@@ -33,11 +33,12 @@
+ 
+ doc_DATA		= $(OTHER_DOCS)
+ 
++if BUILD_DOC
+ man_MANS		= heartbeat.8 apphbd.8 cl_status.1  \
+ 			 hb_standby.1 hb_takeover.1 hb_addnode.1 hb_delnode.1 \
+ 			 ha.cf.5 authkeys.5
+ 
+-STYLESHEET_PREFIX 	?= http://docbook.sourceforge.net/release/xsl/current
++STYLESHEET_PREFIX 	?= /usr/share/sgml/docbook/xsl-stylesheets 
+ MANPAGES_STYLESHEET 	?= $(STYLESHEET_PREFIX)/manpages/docbook.xsl
+ HTML_STYLESHEET 	?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl
+ FO_STYLESHEET 		?= $(STYLESHEET_PREFIX)/fo/docbook.xsl
+@@ -47,6 +48,12 @@
+ XSLTPROC_HTML_OPTIONS 	?= $(XSLTPROC_OPTIONS)
+ XSLTPROC_FO_OPTIONS 	?= $(XSLTPROC_OPTIONS)
+ 
++%.5 %.8 %.1: %.xml
++	$(XSLTPROC) \
++	$(XSLTPROC_MANPAGES_OPTIONS) \
++	$(MANPAGES_STYLESHEET) $<
++endif
++
+ EXTRA_DIST = $(txtfiles) $(htmlfiles) $(man_MANS) $(OTHER_DOCS)
+ 
+ ChangeLog: $(SPECSRC)
+@@ -56,7 +63,3 @@
+ .html.txt:
+ 	if [ "X$(HTML2TXT)" = "X" ]; then echo "Lynx or w3m or user-defined HTML2TXT required to convert $< to $@" >$@ ; else $(HTML2TXT) -dump $< >$@ ; fi
+ 
+-%.5 %.8 %.1: %.xml
+-	$(XSLTPROC) \
+-	$(XSLTPROC_MANPAGES_OPTIONS) \
+-	$(MANPAGES_STYLESHEET) $<
diff --git a/sys-cluster/heartbeat/files/3.0.3-fix_configure.patch b/sys-cluster/heartbeat/files/3.0.3-fix_configure.patch
new file mode 100644
index 000000000000..3b41c83f5991
--- /dev/null
+++ b/sys-cluster/heartbeat/files/3.0.3-fix_configure.patch
@@ -0,0 +1,102 @@
+--- configure.in
++++ configure.in
+@@ -243,11 +243,9 @@
+ mandir=`var "$mandir" "$exec_prefix/man"`
+ dnl docdir is available in autoconf 2.60+, for older versions preseed
+ dnl with the same value that 2.60+ uses
+-docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
+-stdocdir="${docdir}/stonith"
+-libdir=`var "$libdir" "$exec_prefix/lib"`
+-libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
+-noarchlibdir=`var "$noarchlibdir" "$prefix/lib"`
++dnl docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
++dnl stdocdir="${docdir}/stonith"
++dnl libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
+ 
+ 
+ 
+@@ -285,60 +283,11 @@
+   LIBC=`${LDD} ${tmpOutfile} | grep libc | sed -e 's%.*=> *%%' -e 's% .*$%%'`
+   LibCdir=`dirname $LIBC`
+   dirlist=`echo $LibCdir | tr '/' ' '`
+-  LibDirSuffix=unknown
+-  for dir in $dirlist
+-  do
+-    case $dir in
+-      *lib*)	LibDirSuffix=$dir; break;;
+-      *);;
+-    esac
+-  done
+-  case $LibDirSuffix in
+-    unknown)	LibDirSuffix=`basename $LibCdir`;;
+-  esac
+   OutFileType=`file $tmpOutfile`
+   rm -f $tmpCfile $tmpOutfile
+ else
+   AC_MSG_ERROR([Cannot Compile trivial C program])
+ fi
+-#
+-#	The code above doesn't work right everywhere
+-#		(like Fedora and OpenBSD) 
+-#
+-case ${LibDirSuffix} in
+-	*lib*)	: Cool;;
+-	*)	: Sigh...
+-		case $OutFileType in
+-		  *64-bit*)	
+-		  	case $host_os in
+-			  openbsd*)	LibDirSuffix=lib;;
+-		  	  *)		LibDirSuffix=lib64;;
+-			esac;;
+-		  *32-bit*)	LibDirSuffix=lib;;
+-		  *)		LibDirSuffix=lib;;
+-		esac;;
+-esac
+-#
+-#	This may not yet be quite right for PPC where the default
+-#	is to produce 32-bit binaries, even though the OS is 64-bit
+-#	or for that matter for system Z, But, it's a lot better than
+-#	it used to be.
+-#
+-AC_MSG_RESULT($LibDirSuffix)
+-
+-case $libdir in
+-  */*${LibDirSuffix})	: Cool ;;
+-  *)			: Uh Oh... 
+-	libdir=`dirname $libdir`/$LibDirSuffix
+-	AC_MSG_WARN([Overriding libdir to: $libdir]);;
+-esac
+-case $libexecdir in
+-  */$LibDirSuffix)	: Cool ;;
+-  *)			: Uh Oh... 
+-	libexecdir=`dirname $libexecdir`/$LibDirSuffix
+-	AC_MSG_WARN([Overriding libexecdir to: $libexecdir]);;
+-esac
+-
+ for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \
+ 	includedir oldincludedir mandir docdir stdocdir libdir noarchlibdir
+ do 
+@@ -387,7 +336,6 @@
+ fi
+ 
+ AC_CHECK_HEADERS(heartbeat/glue_config.h)
+-GLUE_HEADER=none
+ if test "$ac_cv_header_heartbeat_glue_config_h" = "yes";  then
+    GLUE_HEADER=heartbeat/glue_config.h
+ else
+@@ -454,15 +402,6 @@
+ 
+ dnl	We use this in the RPM specfile...
+ AC_SUBST(ac_configure_args)
+-cleaned_configure_args=""
+-for j in ${ac_configure_args}
+-do
+-  case $j in
+-    *--libdir=*|*--libexecdir=*)	;;
+-    *)		cleaned_configure_args="$cleaned_configure_args $j";;
+-  esac
+-done
+-AC_SUBST(cleaned_configure_args)
+ 
+ dnl *************************************************************************
+ PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
diff --git a/sys-cluster/heartbeat/files/3.0.3-python_tests.patch b/sys-cluster/heartbeat/files/3.0.3-python_tests.patch
new file mode 100644
index 000000000000..a91c7ec3fe2a
--- /dev/null
+++ b/sys-cluster/heartbeat/files/3.0.3-python_tests.patch
@@ -0,0 +1,29 @@
+--- cts/Makefile.am
++++ cts/Makefile.am
+@@ -21,7 +21,7 @@
+ 
+ ctsdir		= @HA_NOARCHDATAHBDIR@/cts
+ 
+-cts_PYTHON	=				\
++cts_SCRIPTS	=				\
+ 			CM_fs.py		\
+ 			CM_hb.py		\
+ 			CM_LinuxHAv2.py		\
+@@ -32,14 +32,12 @@
+ 			extracttests.py		\
+ 			getpeinputs.sh		\
+ 			OCFIPraTest.py		\
+-			CIB.py
++			CIB.py			\
++			CTSproxy.py		\
++			LSBDummy
+ 
+ cts_DATA	=	README
+ 
+-cts_SCRIPTS	=				\
+-			CTSproxy.py		\
+-			getpeinputs.sh		\
+-			LSBDummy
+ 
+ all-local: $(cts_PYTHON)
+ 
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.3.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.3.ebuild
new file mode 100644
index 000000000000..902addc32037
--- /dev/null
+++ b/sys-cluster/heartbeat/heartbeat-3.0.3.ebuild
@@ -0,0 +1,81 @@
+# 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.ebuild,v 1.1 2010/06/21 14:35:33 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 snmp static-libs"
+
+RDEPEND="
+	sys-cluster/cluster-glue
+	dev-libs/glib:2
+	virtual/ssh
+	net-libs/gnutls
+	snmp? ( net-analyzer/net-snmp )
+	dev-lang/swig
+	"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+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
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-fatal-warnings \
+		$(use_enable static-libs static) \
+		$(use_enable doc) \
+		--disable-tipc \
+		--enable-libnet \
+		--enable-ipmilan \
+		--enable-dopd \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable snmp) \
+		--with-group-id=65 --with-ccmuser-id=65
+}
+
+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
+	rm -rf "${D}"/usr/include/heartbeat/{compress,ha_msg}.h
+
+	if use doc ; then
+		dodoc README doc/*.txt doc/AUTHORS  || die
+	fi
+}