Version bump.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 371 insertions, 5 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 21ef18ee4373..2daa6b5e8b33 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/pacemaker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.12 2011/07/05 07:28:53 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.13 2011/07/08 13:47:33 ultrabug Exp $
+
+*pacemaker-1.1.5 (08 Jul 2011)
+
+  08 Jul 2011; Ultrabug <ultrabug@gentoo.org> +pacemaker-1.1.5.ebuild,
+  +files/pacemaker-1.1.5-autotools.patch:
+  Version bump.
 
 *pacemaker-1.0.11 (05 Jul 2011)
 
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index f8d09bb58913..f16a445be0e7 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -4,20 +4,23 @@ Hash: SHA256
 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-autotools-r2.patch 9932 RMD160 6240324b9188ab5beb5ec2ec775c66a94cc3c7be SHA1 5cb30350c92cd5019f892c2c37d7cb53190c3b79 SHA256 62d937c6a7894a686a79530f6daa2a5f814fecd6ea29dc700308e89d668e488d
+AUX pacemaker-1.1.5-autotools.patch 9673 RMD160 f2f6aa1ee801ebe8fa55da22f6644c63e450ce8e SHA1 e2534eb274c4f24b1d6dc0518c3811e90f19385e SHA256 5aa8b3ff97e63d380e3913f838e0ec7bbe477bd09c74668bc15a3456c65f9fe3
 AUX pacemaker.initd 922 RMD160 1ee204b244f3e40a6fb272f43d0cf11d7e4404d0 SHA1 7ffa0222674d5003d550b51bad7f0735366ffe01 SHA256 0253da4a3a91d8c3aa7badd30062cbba32a0626b77f1a27db1d731d1bbe133af
 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.0.11.tar.bz2 6706773 RMD160 6ab3dbccf537a2b635a87b0089307b5309705df4 SHA1 7b3bb3401d9a9183130766625a0e8eb587f89b55 SHA256 568a8a7257ca9eb2d546c74fb18ee27d1e4e8eb58d9e2be0325cda1569b0ae75
 DIST Pacemaker-1.1.4.tar.bz2 23444765 RMD160 ca2635622e2a63258d7dc9933541eb2e3b728679 SHA1 382a4cbd80ef8f1c303f1c5c02d60390e808397f SHA256 922e2929cf9f2efa2e2d9b3185a7ac826a96e86cd8d9f4c4eae177f88f1f03b1
+DIST Pacemaker-1.1.5.tar.bz2 23531621 RMD160 56761cb9bb9aa22d0275fedc851269a5f472d29e SHA1 da8c6f09e549879961231028582fdbe69c9ac8c6 SHA256 aa1dcf2dc6deff3676fa7d0938f80bb4f163011d491d0478798e971ca2d58fb2
 EBUILD pacemaker-1.0.10.ebuild 1704 RMD160 6f11269269bf3ec33d8f9ac0ea91c3f43d273644 SHA1 8ea2440ed206ecf371ee5d2937d0589776a8008e SHA256 fc5b74f7ee393bf6875591f9a7f34b9d2fe49ba52b79d58e2ed6478bc838d28b
 EBUILD pacemaker-1.0.11.ebuild 1712 RMD160 455c4b219d7a624072bf161ab77eef10c8d7e163 SHA1 aaa9c39bfeff11bd6f292a9a990e6145da1cc3c6 SHA256 289e83c763d2d35c78c45a229bad65793d385fae111fa4fcd5c9184d697f2cce
 EBUILD pacemaker-1.1.4-r4.ebuild 2155 RMD160 04f78cbea02a19add3a438efdda2fd9fe2b60358 SHA1 b7736c48625691174b1e6a6b825b46152b96fe46 SHA256 02220c06c7a40aac92a096011f746432450105081e6ba4fbcaa43efc4e804a08
-MISC ChangeLog 2390 RMD160 b3b9678a22783a78690eb674d14799c9f7ef4582 SHA1 07f3874f81866986ed3eee1ba140a7f917ea0bbf SHA256 112b8d177df809d3b8fbafa18e8a449e61349d343ae152256ca3cbbd7d9baf19
+EBUILD pacemaker-1.1.5.ebuild 2172 RMD160 d0a7ad662bc327d7ef4dcd572b130dbadd5cfe41 SHA1 1082aebce52bc1492e2dc12839983bbbafdae4ca SHA256 65ca356fb86e075ce93d1e7d74556f2010709abe4aa8872b8612355381426c51
+MISC ChangeLog 2552 RMD160 7b4fd71093b89f735465c7b63c6072029290e94b SHA1 fd1fa3769355d6c54f28c82442785600b78c64f6 SHA256 00efe91761bca813c463e8b2ae748207daffb52d69e644bc600f5738d8c9c638
 MISC metadata.xml 797 RMD160 c99dc189163047b32ad1915b13e33cc01a407481 SHA1 c9a83889da12df16797e7436751e184440ef9537 SHA256 904067d2d16de829ccfc138dde85ea965db6d680b4cea293105542a5a8b9ca52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4SvT4ACgkQKiQSS7ZY+hP32QEAu+U1uz+z1pFaH7ibEbMPXB4M
-ucaxiNSzDYvXHE/k448A/0+VkviWXz9SkaS4HCmwIZySBuDP59Q+kuqw4ya52H/i
-=Y5Q8
+iF4EAREIAAYFAk4XCn4ACgkQKiQSS7ZY+hMikAD+JFTMvStIDlGmCoS8+isUSseS
+Zf9ssofBzcv3EjwktyUBALotK/P19NhmYdzfRkV0qIf/GkE6Qr116pA6/067R4E7
+=YYP2
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
new file mode 100644
index 000000000000..b4098eed2af4
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
@@ -0,0 +1,271 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1354,6 +1354,7 @@
+ if
+     $PKGCONFIG --exists $SERVICELOG
+ then
++    PKG_CHECK_MODULES([SERVICELOG], [servicelog-1])
+     SERVICELOG_EXISTS="yes"
+ fi
+ AC_MSG_RESULT($SERVICELOG_EXISTS)
+@@ -1366,6 +1367,7 @@
+ if
+     $PKGCONFIG --exists $OPENIPMI $SERVICELOG
+ then
++    PKG_CHECK_MODULES([OPENIPMI_SERVICELOG],[OpenIPMI OpenIPMIposix])
+     OPENIPMI_SERVICELOG_EXISTS="yes"
+ fi
+ AC_MSG_RESULT($OPENIPMI_SERVICELOG_EXISTS)
+--- a/mcp/Makefile.am
++++ b/mcp/Makefile.am
+@@ -34,7 +34,7 @@
+ noinst_HEADERS		= 
+ 
+ pacemakerd_SOURCES	= pacemaker.c corosync.c
+-pacemakerd_LDADD	= $(CLUSTERLIBS) $(top_builddir)/lib/common/libcrmcommon.la -lcfg -lconfdb
++pacemakerd_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la $(CLUSTERLIBS) -lcfg -lconfdb
+ 
+ %.8:	%
+ 	echo Creating $@
+--- a/crmd/Makefile.am
++++ b/crmd/Makefile.am
+@@ -41,14 +41,13 @@
+ 		cib.c pengine.c tengine.c lrm.c 			\
+ 		utils.c misc.c te_events.c te_actions.c te_utils.c te_callbacks.c
+ 
+-crmd_LDADD	= $(CLUSTERLIBS) -llrm					\
+-		$(top_builddir)/lib/fencing/libstonithd.la		\
++crmd_LDADD	= $(top_builddir)/lib/fencing/libstonithd.la		\
+ 		$(top_builddir)/lib/transition/libtransitioner.la	\
+ 		$(top_builddir)/lib/pengine/libpe_rules.la		\
+ 		$(top_builddir)/lib/cib/libcib.la			\
+ 		$(top_builddir)/lib/common/libcrmcluster.la		\
+-		$(top_builddir)/lib/common/libcrmcommon.la
+-
++		$(top_builddir)/lib/common/libcrmcommon.la		\
++		$(CLUSTERLIBS) -llrm
+ if BUILD_XML_HELP
+ man8_MANS =	crmd.8
+ 
+--- a/lib/common/Makefile.am
++++ b/lib/common/Makefile.am
+@@ -38,7 +38,7 @@
+ endif
+ 
+ libcrmcluster_la_LDFLAGS = -version-info 1:0:0
+-libcrmcluster_la_LIBADD  = $(CLUSTERLIBS) libcrmcommon.la
++libcrmcluster_la_LIBADD  = libcrmcommon.la $(CLUSTERLIBS)
+ libcrmcluster_la_DEPENDENCIES = libcrmcommon.la
+ 
+ # Can't use -Wcast-qual here because glib insists on pretending things are const  
+@@ -51,7 +51,8 @@
+ 
+ libcrmcommon_la_SOURCES	= ipc.c utils.c xml.c iso8601.c iso8601_fields.c remote.c mainloop.c
+ 
+-libcrmcommon_la_LDFLAGS	= -version-info 2:0:0  $(GNUTLSLIBS)
++libcrmcommon_la_LDFLAGS	= -version-info 2:0:0
++libcrmcommon_la_LIBADD  = $(GNUTLSLIBS)
+ 
+ clean-generic:
+ 	rm -f *.log *.debug *.xml *~
+--- a/lib/plugins/lrm/Makefile.am
++++ b/lib/plugins/lrm/Makefile.am
+@@ -29,8 +29,8 @@
+ plugin_LTLIBRARIES = stonith.la
+ 
+ stonith_la_SOURCES = raexecstonith.c
+-stonith_la_LDFLAGS = -lpils -export-dynamic -module -avoid-version \
+-		     $(top_builddir)/lib/fencing/libstonithd.la -llrm
++stonith_la_LDFLAGS = -export-dynamic -module -avoid-version
++stonith_la_LIBADD = $(top_builddir)/lib/fencing/libstonithd.la -lpils -llrm
+ 
+ install-exec-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(lrmdir)
+--- a/lib/fencing/Makefile.am
++++ b/lib/fencing/Makefile.am
+@@ -25,8 +25,8 @@
+ lib_LTLIBRARIES = libstonithd.la
+ 
+ libstonithd_la_SOURCES = st_client.c
+-libstonithd_la_LDFLAGS = -version-info 1:0:0 				\
+-			-lplumb -lstonith $(CLUSTERLIBS)		\
+-			$(top_builddir)/lib/common/libcrmcommon.la
++libstonithd_la_LDFLAGS = -version-info 1:0:0
++libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la 	\
++			-lplumb -lstonith $(CLUSTERLIBS)
+ 
+ AM_CFLAGS = $(INCLUDES)
+--- a/cib/Makefile.am
++++ b/cib/Makefile.am
+@@ -47,8 +47,8 @@
+ cib_SOURCES		= io.c messages.c notify.c	\
+ 			callbacks.c main.c remote.c common.c
+ 
+-cib_LDADD		= $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)	\
+-			$(top_builddir)/lib/common/libcrmcluster.la
++cib_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la \
++			  $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
+ 
+ cibmon_SOURCES		= cibmon.c
+ cibmon_LDADD		= $(COMMONLIBS) 
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -62,8 +62,8 @@
+ noinst_HEADERS		= 
+ 
+ crmadmin_SOURCES	= crmadmin.c
+-crmadmin_LDADD		= $(COMMONLIBS) $(CLUSTERLIBS) \
+-			$(top_builddir)/lib/pengine/libpe_status.la
++crmadmin_LDADD		= $(top_builddir)/lib/pengine/libpe_status.la \
++			  $(COMMONLIBS) $(CLUSTERLIBS)
+ 
+ crm_uuid_SOURCES	= crm_uuid.c
+ crm_uuid_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la
+@@ -75,45 +75,45 @@
+ crm_shadow_LDADD	= $(COMMONLIBS) 
+ 
+ crm_node_SOURCES	= ccm_epoche.c
+-crm_node_LDADD		= $(COMMONLIBS) $(CLUSTERLIBS) \
+-			$(top_builddir)/lib/common/libcrmcluster.la
++crm_node_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la \
++			  $(COMMONLIBS) $(CLUSTERLIBS)
+ 
+ crm_simulate_SOURCES	= crm_inject.c
+ crm_simulate_CFLAGS	= -I$(top_srcdir)/pengine
+ 
+-crm_simulate_LDADD	= $(COMMONLIBS)						\
+-			$(top_builddir)/lib/pengine/libpe_status.la		\
++crm_simulate_LDADD	= $(top_builddir)/lib/pengine/libpe_status.la		\
+ 			$(top_builddir)/pengine/libpengine.la 			\
+ 			$(top_builddir)/lib/cib/libcib.la			\
+-			$(top_builddir)/lib/transition/libtransitioner.la
++			$(top_builddir)/lib/transition/libtransitioner.la	\
++			$(COMMONLIBS)
+ 
+ crm_diff_SOURCES	= xml_diff.c
+ crm_diff_LDADD		= $(COMMONLIBS)
+ 
+ crm_mon_SOURCES		= crm_mon.c
+-crm_mon_LDADD		= $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm \
+-			$(top_builddir)/lib/pengine/libpe_status.la
++crm_mon_LDADD		= $(top_builddir)/lib/pengine/libpe_status.la		\
++			  $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm
+ 
+ # Arguments could be made that this should live in crm/pengine
+ crm_verify_SOURCES	= crm_verify.c
+-crm_verify_LDADD	= $(COMMONLIBS) \
+-			$(top_builddir)/lib/pengine/libpe_status.la \
+-			$(top_builddir)/pengine/libpengine.la
++crm_verify_LDADD	= $(top_builddir)/lib/pengine/libpe_status.la 	\
++			$(top_builddir)/pengine/libpengine.la		\
++			$(COMMONLIBS)
+ 
+ crm_attribute_SOURCES	= crm_attribute.c
+ crm_attribute_LDADD	= $(COMMONLIBS)
+ 
+ crm_resource_SOURCES	= crm_resource.c
+-crm_resource_LDADD	= $(COMMONLIBS) \
+-			$(top_builddir)/lib/pengine/libpe_rules.la  \
++crm_resource_LDADD	= $(top_builddir)/lib/pengine/libpe_rules.la  \
+ 			$(top_builddir)/lib/pengine/libpe_status.la \
+-			$(top_builddir)/pengine/libpengine.la
++			$(top_builddir)/pengine/libpengine.la \
++			$(COMMONLIBS)
+ 
+ iso8601_SOURCES		= test.iso8601.c
+ iso8601_LDADD		= $(COMMONLIBS) 
+ 
+ attrd_SOURCES		= attrd.c
+-attrd_LDADD		= $(COMMONLIBS) $(top_builddir)/lib/common/libcrmcluster.la
++attrd_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la $(COMMONLIBS)
+ 
+ #pingd_SOURCES		= pingd.c
+ #pingd_LDADD		= $(COMMONLIBS)
+@@ -123,14 +123,14 @@
+ 
+ if BUILD_SERVICELOG
+ notifyServicelogEvent_SOURCES	= notifyServicelogEvent.c
+-notifyServicelogEvent_CFLAGS	= `pkg-config --cflags servicelog-1`
+-notifyServicelogEvent_LDFLAGS	= `pkg-config --libs servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
++notifyServicelogEvent_CFLAGS	= $(SERVICELOG_CFLAGS)
++notifyServicelogEvent_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la $(SERVICELOG_LIBS)
+ endif
+ 
+ if BUILD_OPENIPMI_SERVICELOG
+ ipmiservicelogd_SOURCES	= ipmiservicelogd.c
+-ipmiservicelogd_CFLAGS	= `pkg-config --cflags OpenIPMI OpenIPMIposix servicelog-1`
+-ipmiservicelogd_LDFLAGS	= `pkg-config --libs OpenIPMI OpenIPMIposix servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
++ipmiservicelogd_CFLAGS	= $(OPENIPMI_SERVICELOG_CFLAGS) $(SERVICELOG_CFLAGS) 
++ipmiservicelogd_LDFLAGS	= $(top_builddir)/lib/common/libcrmcommon.la $(OPENIPMI_SERVICELOG_LIBS) $(SERVICELOG_LIBS)
+ endif
+ 
+ %.8:	% crm_attribute
+--- a/extra/Makefile.am
++++ b/extra/Makefile.am
+@@ -20,5 +20,5 @@
+ 
+ SUBDIRS                 =  resources
+ 
+-mibdir = $(datadir)/snmp/mibs
++mibdir = $(datadir)/$(PACKAGE)/snmp/mibs
+ mib_DATA = PCMK-MIB.txt
+--- a/fencing/Makefile.am	2011-02-25 09:58:45.621572915 +0100
++++ b/fencing/Makefile.am	2011-02-25 10:00:39.024820006 +0100
+@@ -42,23 +42,23 @@
+ 
+ stonith_test_SOURCES	= test.c
+ 
+-stonith_test_LDADD	= $(CRYPTOLIB) $(CLUSTERLIBS)			\
+-			$(top_builddir)/lib/common/libcrmcommon.la	\
++stonith_test_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
+ 			$(top_builddir)/lib/common/libcrmcluster.la	\
+-			$(top_builddir)/lib/fencing/libstonithd.la
++			$(top_builddir)/lib/fencing/libstonithd.la	\
++			$(CRYPTOLIB) $(CLUSTERLIBS)
+ 
+ stonith_admin_SOURCES	= admin.c
+ 
+-stonith_admin_LDADD	= $(CRYPTOLIB) $(CLUSTERLIBS)			\
++stonith_admin_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
+ 			$(top_builddir)/lib/cib/libcib.la		\
+ 			$(top_builddir)/lib/pengine/libpe_status.la	\
+-			$(top_builddir)/lib/common/libcrmcommon.la	\
+ 			$(top_builddir)/lib/common/libcrmcluster.la	\
+-			$(top_builddir)/lib/fencing/libstonithd.la
++			$(top_builddir)/lib/fencing/libstonithd.la	\
++			$(CRYPTOLIB) $(CLUSTERLIBS)
+ 
+ stonithd_SOURCES	= main.c commands.c remote.c
+ 
+-stonithd_LDADD		= $(CRYPTOLIB) $(CLUSTERLIBS)			\
+-			$(top_builddir)/lib/common/libcrmcommon.la	\
++stonithd_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
+ 			$(top_builddir)/lib/common/libcrmcluster.la	\
+-			$(top_builddir)/lib/fencing/libstonithd.la
++			$(top_builddir)/lib/fencing/libstonithd.la	\
++			$(CRYPTOLIB) $(CLUSTERLIBS)
+--- a/pengine/Makefile.am
++++ b/pengine/Makefile.am
+@@ -71,16 +71,17 @@
+ libpengine_la_SOURCES	= pengine.c allocate.c utils.c constraints.c \
+ 			native.c group.c clone.c master.c graph.c
+-libpengine_la_LIBADD    = $(top_builddir)/lib/pengine/libpe_status.la
++libpengine_la_LIBADD    = $(top_builddir)/lib/pengine/libpe_status.la \
++	$(top_builddir)/lib/cib/libcib.la
+ 
+ pengine_SOURCES	= main.c
+-pengine_LDADD	= $(COMMONLIBS)	$(top_builddir)/lib/cib/libcib.la
++pengine_LDADD	= $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
+ # libcib for get_object_root()
+ #		$(top_builddir)/lib/hbclient/libhbclient.la
+ 
+ ptest_SOURCES	= ptest.c 
+-ptest_LDADD	= $(COMMONLIBS)						\
+-		$(top_builddir)/lib/cib/libcib.la			\
+-		$(top_builddir)/lib/transition/libtransitioner.la
++ptest_LDADD	= $(top_builddir)/lib/cib/libcib.la			\
++		$(top_builddir)/lib/transition/libtransitioner.la	\
++		$(COMMONLIBS)
+ 
+ install-exec-local:
+ 	$(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
new file mode 100644
index 000000000000..3c0247b032d6
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild,v 1.1 2011/07/08 13:47:33 ultrabug Exp $
+
+EAPI=3
+
+inherit autotools base eutils flag-o-matic multilib python
+
+MY_PN="Pacemaker"
+MY_P="${MY_PN}-${PV}"
+PYTHON_DEPEND="2"
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
+SRC_URI="http://hg.clusterlabs.org/${PN}/1.1/archive/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="acl heartbeat smtp snmp static-libs"
+
+RDEPEND="
+	dev-libs/libxslt
+	sys-cluster/corosync
+	sys-cluster/cluster-glue
+	sys-cluster/resource-agents
+	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
+	smtp? ( net-libs/libesmtp )
+	snmp? ( net-analyzer/net-snmp )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-autotools.patch"
+)
+
+S=${WORKDIR}/${MY_PN}-1-1-${MY_P}
+
+pkg_setup() {
+	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 || myopts="--with-ais"
+	# appends lib to localstatedir automatically
+	econf \
+		--localstatedir=/var \
+		--disable-dependency-tracking \
+		--disable-fatal-warnings \
+		--with-cs-quorum \
+		--without-cman \
+		$(use_with acl) \
+		$(use_with heartbeat) \
+		$(use_with smtp esmtp) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		${myopts}
+}
+
+src_install() {
+	base_src_install
+	newinitd "${FILESDIR}/pacemaker.initd" pacemaker || die
+	insinto /etc/corosync/service.d
+	newins "${FILESDIR}/pacemaker.service" pacemaker || die
+}
+
+pkg_postinst() {
+	elog "This version of Pacemaker uses the new MCP feature"
+	elog "and the v1 plugin for CoroSync. Read [1] for more info."
+	elog
+	elog "To start the Pacemaker Cluster Manager, run:"
+	elog "/etc/init.d/pacemaker start"
+	elog
+	elog "[1] http://theclusterguy.clusterlabs.org/post/907043024/introducing-the-pacemaker-master-control-process-for"
+	elog
+	elog "Note: sys-cluster/openais is no longer a hard dependency of ${P},"
+	elog "so you may need to install it yourself to suit your needs."
+}