[sys-cluster/pacemaker] version bump

4 files changed, 106 insertions, 0 deletions

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 97ec4a635..ac27f08a1 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,5 +1,9 @@
+AUX pacemaker-1.0.10-asneeded.patch 750 RMD160 9aaf83ce34c8c3f35db805108d3446dd66a66e81 SHA1 58393bcef301cda18f4bc008f4edeba00ed90ffa SHA256 552e14bc626aafc7f290d5d5e2968679ee8b506bb200ef5f1bdb1dfd17db2b34
+AUX pacemaker-1.0.10-installpaths.patch 200 RMD160 d2b3bdae8d6f982b64af5f83375497df74fadbc0 SHA1 69a1b9a2c7415a0e0d10c982ecb64474da358fb3 SHA256 4b8d82244123f88491b7deecb99b2d36d6317ada5aa6c6339e95dbcdc73dbbee
 AUX pacemaker-1.1.4-installpaths.patch 200 RMD160 d2b3bdae8d6f982b64af5f83375497df74fadbc0 SHA1 69a1b9a2c7415a0e0d10c982ecb64474da358fb3 SHA256 4b8d82244123f88491b7deecb99b2d36d6317ada5aa6c6339e95dbcdc73dbbee
 AUX pacemaker.initd 815 RMD160 f9c28c5d5a9a4f720954dc93966dcb8a04623173 SHA1 bc4a951e670144d6ff137f09b2beef9102634457 SHA256 adf97c7fe78cadc5390ac30f32377bf1afb67afd55e89ec93ffa742d4e2d0017
 AUX pacemaker.service 105 RMD160 e743788acefa97f879ea67b5b3bbbff715c71bce SHA1 42739d9a111a25a643d8f5f8b9fdd2cf1267853a SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c
+DIST Pacemaker-1.0.10.tar.bz2 6642704 RMD160 9eaac150c7e3e7f2e1c00303025aa8fe5bfb90c7 SHA1 5901533948f85a1adfe2264b2ac0dae14ad8c116 SHA256 2d5635866dcf061a617a33bc4ae7957d038dd764ad840489e4f2f6b8d046e6f9
 DIST Pacemaker-1.1.4.tar.bz2 23444765 RMD160 ca2635622e2a63258d7dc9933541eb2e3b728679 SHA1 382a4cbd80ef8f1c303f1c5c02d60390e808397f SHA256 922e2929cf9f2efa2e2d9b3185a7ac826a96e86cd8d9f4c4eae177f88f1f03b1
+EBUILD pacemaker-1.0.10.ebuild 1718 RMD160 1b704c19c5b4709019f2d45e7154cc1622cc8d67 SHA1 52349c76b6a40c777e5f62bd1ddbcf81c25c5ae7 SHA256 0f757d6cf23b1e4b5e39844fc3143b0d486570bdc73b8f6957bfab9b36cbdaac
 EBUILD pacemaker-1.1.4.ebuild 2132 RMD160 191f1aeea43ba7ab69e95a92946a295c9a2a973b SHA1 f6c13b4f3985637d56ebbe820cac9d1405c682e6 SHA256 db9608e51751fa29c8c2ea3041d691aeeed50159ecffc41a6719f4bfc58e0bf6
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.0.10-asneeded.patch b/sys-cluster/pacemaker/files/pacemaker-1.0.10-asneeded.patch
new file mode 100644
index 000000000..ac2655049
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-1.0.10-asneeded.patch
@@ -0,0 +1,22 @@
+--- Makefile.am
++++ Makefile.am
+@@ -23,7 +23,7 @@
+ MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure DRF/config-h.in \
+                         DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
+
+-SUBDIRS	= debian $(LIBLTDL_DIR) replace include lib pengine cib crmd fencing tools shell xml cts extra doc
++SUBDIRS	= $(LIBLTDL_DIR) replace include lib pengine cib crmd fencing tools shell xml cts extra doc
+
+ doc_DATA = AUTHORS COPYING COPYING.LIB
+
+--- lib/pengine/Makefile.am
++++ lib/pengine/Makefile.am
+@@ -34,7 +34,7 @@
+
+ libpe_status_la_LDFLAGS	= -version-info 2:0:0
+ libpe_status_la_SOURCES	=  $(rule_files) $(status_files)
+-libpe_status_la_LIBADD	= -llrm
++libpe_status_la_LIBADD	= -llrm @CURSESLIBS@
+
+ clean-generic:
+ 	rm -f *.log *.debug *~
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch b/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch
new file mode 100644
index 000000000..5187b7967
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch
@@ -0,0 +1,9 @@
+--- extra/Makefile.am
++++ extra/Makefile.am
+@@ -20,5 +20,5 @@
+
+ SUBDIRS                 =  resources
+
+-mibdir = $(datadir)/snmp/mibs
++mibdir = $(datadir)/$(PACKAGE)/snmp/mibs
+ mib_DATA = PCMK-MIB.txt
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
new file mode 100644
index 000000000..707567cf0
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.9.1-r1.ebuild,v 1.1 2010/08/12 08:38:56 xarthisius Exp $
+
+EAPI="2"
+
+MY_PN="Pacemaker"
+MY_P="${MY_PN}-${PV}"
+PYTHON_DEPEND="2"
+inherit python autotools multilib eutils base flag-o-matic
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.clusterlabs.org/"
+SRC_URI="http://hg.clusterlabs.org/${PN}/stable-1.0/archive/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="+ais heartbeat smtp snmp static-libs"
+
+RDEPEND="
+	dev-libs/libxslt
+	sys-cluster/cluster-glue
+	sys-cluster/resource-agents
+	ais? ( sys-cluster/openais )
+	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
+	smtp? ( net-libs/libesmtp )
+	snmp? ( net-analyzer/net-snmp )
+	!heartbeat? ( !ais? ( sys-cluster/openais ) )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.10-asneeded.patch"
+	"${FILESDIR}/${PN}-1.0.10-installpaths.patch"
+)
+
+S="${WORKDIR}/${MY_PN}-1-0-${MY_P}"
+
+pkg_setup() {
+	if ! use ais && ! use heartbeat; then
+		ewarn "You disabled both cluster implementations"
+		ewarn "Silently enabling OpenAIS/CoroSync support."
+	fi
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e "/ggdb3/d" configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myopts=""
+
+	use heartbeat || use ais || myopts="--with-ais"
+	# appends lib to localstatedir automatically
+	econf \
+		--localstatedir=/var \
+		--disable-dependency-tracking \
+		--disable-fatal-warnings \
+		$(use_with ais) \
+		$(use_with heartbeat) \
+		$(use_with smtp esmtp) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		${myopts}
+}