fix #526770, drop old and version bump

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

6 files changed, 59 insertions, 128 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 72b4dea40d6a..013c853c14e0 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/pacemaker
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.35 2014/12/02 14:45:32 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.36 2014/12/12 13:41:15 ultrabug Exp $
+
+*pacemaker-1.1.12 (12 Dec 2014)
+
+  12 Dec 2014; Ultrabug <ultrabug@gentoo.org> -pacemaker-1.1.7.ebuild,
+  -pacemaker-1.1.8-r2.ebuild, pacemaker-1.1.10.ebuild,
+  +pacemaker-1.1.12.ebuild, +files/pacemaker-1.1.10-tinfo.patch:
+  fix #526770, drop old and version bump
 
   02 Dec 2014; Ultrabug <ultrabug@gentoo.org> pacemaker-1.0.10.ebuild,
   pacemaker-1.0.12.ebuild:
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 4cecd3e05463..191e6ca58c88 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -6,24 +6,23 @@ AUX 1.1.7-glibc2.16.patch 262 SHA256 4c0cce3eb7b02e7a879b81549e8300ca3d71af70d53
 AUX 1.1.8-backwards_compatibility.patch 1574 SHA256 e76dc96b2bcec2c7ea52be3a69b31668cac6292942c100ef4edf02deb5e37d8c SHA512 0544ed0bbb4b7ba7a39d03cc1f77be43ae35b315549304ba77d723a2545509c8069b208def3a3ae5510b0d2e51b7ef1c78f803902ed002b98aebd60c9ed221e1 WHIRLPOOL 1e87359be7695c84310e1497f247fbecc4570baa91895755ca92f32d4260fb8423a408c536750ded1f932d37c9f2c50c7791ac29f724645c1dd4f452f46ef929
 AUX pacemaker-1.0.10-asneeded.patch 750 SHA256 552e14bc626aafc7f290d5d5e2968679ee8b506bb200ef5f1bdb1dfd17db2b34 SHA512 01df0f4e0b7b429138cb0599242de0bb2c82ceb5f4cb2bf9c3c9952630c3721484fb9fb9367a09fea6d2234e1086b1ebb651bc42f9dbd81e2d17dee881c1e09b WHIRLPOOL 07cae71b91114a5aa7d22f48e41e72e11eb9676389f3df4c9158e878de28ac40665535e2dcc452e284758aac43261c5af4a6c681873bdcd7abc5d87ba18f19c4
 AUX pacemaker-1.0.10-installpaths.patch 200 SHA256 4b8d82244123f88491b7deecb99b2d36d6317ada5aa6c6339e95dbcdc73dbbee SHA512 68442af7365c145f28346e5d1b53ba8498b59b619cc6f769f5b407c246cd676821b28b7241777523794251cf1bdd36d57f2ace6d294ad6e33137bc57d71ae492 WHIRLPOOL 4c0e9c7deb9ed9244cb349ea8055328bf6d70b2dbc57b79538176a7fc5aca703ea4709623f137909203f76f376bf734175afbea56ebede7bf01614b6b0c8d4b4
+AUX pacemaker-1.1.10-tinfo.patch 767 SHA256 5ed6ba9d70df8c288005cf73d9080cd842998485565ba9aa5b62ba69873c0949 SHA512 2418cb275d69e5a589ed5e7aba707719c23bbdae83f2700b4fdabe9df03bf6f6922ef7db6f09b0c06d6d66e8cd661eed37f9c905a5781f865842517a3bd56358 WHIRLPOOL e7e0291140e302fcbd007befaf7ca87ecc2da437ab79cb5bd8db1feee7c58e76d97cabe2296ee29cdcf1d1c3dff2ac572708afa381727201199958b3a7ffb822
 AUX pacemaker.initd 981 SHA256 9c081cbbf9e3843d61f8175e430f82414bd21661b6b7fb31f74b9c6c64874204 SHA512 ebf1fa1043dda01e1409960f6a0b13284186644e4ced9e348e61ac137c4d8151aa4bf82740fc553a347d19e547f61f5f08d7bd24ce2247dfeae38e7648945103 WHIRLPOOL edc3634278151e5c88082768b71281cc8cd1dd5b191ac93da219b0024a30e29fad538b904a99805b55d20ebec7212c7d8e4269524a846ece117a8aa442ab7c7e
 AUX pacemaker.service 105 SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b WHIRLPOOL ec891f83ec9f561060b08bd39e9e0ecf5b243617958bd68f07a2f087a881af85895a4f25f810657ababb6d4541dfcc63e59e195fb6006717dc0cb69a1f869376
 DIST Pacemaker-1.0.10.tar.bz2 6642704 SHA256 2d5635866dcf061a617a33bc4ae7957d038dd764ad840489e4f2f6b8d046e6f9 SHA512 ceed7414ce14d136205d35f4e3e11aa0c5b57b3e0069486ea2b9827d3f78f69ff216474348d3360f31ace06d1071f9287ae3300a495391509c2fb43407fc2711 WHIRLPOOL 3ac764ddcf00eebd851fdd69398670bb4cb5c083f89c6e770759463da8b1fb0f0ca03c0bb134386c45703e0db7b50139e466ba71ded72647131abde4301c283f
 DIST Pacemaker-1.1.10.tar.gz 10184661 SHA256 aba417c8a719d380d7bac741f26d2af8f7264d96828f3cf059a3c48fc9741ab4 SHA512 7d975704ab560fcca66f9d9d389e029321e2032bc3d41975ead8295b3f692163a446d981ac20d471b1e7f9ae75b4c65e622b9db88211f0541a17d7a16e9a2d78 WHIRLPOOL 06e2ef217cbfb1429be1fc0844072d337229f4e77376523be66d133cb352554cf0544cc2af6442556672849af036ee0c0cb22e0fc660e46c4cb96baddbe210d0
+DIST Pacemaker-1.1.12.tar.gz 10459675 SHA256 f5c72b609fac18d362880d120f08f990e8afd9388e6ff86c55cd93900ba54d9c SHA512 cf88a313f5e91f445a159a5d800d27fd891f63c082c92d3f09bfd2aff856325e8ef6e0ebab8c0b2b9cd6eb15cc593c58c8e23e888e17d5286ebc651dd096f9c1 WHIRLPOOL e737d70288936d2f76d310848940bde78537c32e703c68d8dd37a78e54a66dc9d34cf2fe0037f1621fbc5ba10bb9688490da96394cde65f0668d4b62eccf3f03
 DIST pacemaker-1.0.12.tar.gz 7481273 SHA256 a3b4ea4106eda19ff5569bf0631168454b481fbfd23342421010832cce0a504e SHA512 a6944318cfbddaacfd87dda82be9c377af85cb9f92f913d785f5e8a060c23480a972efc0b255af9ad7c1bbd0f7c5ee57f5e7d9797fe3b2549f4c31c7751c1d86 WHIRLPOOL 2f707c4f74c235b358fff50b4e60069b4c16c9fac5114a74ba75d6aca85c67c56b43f49d1496f876b55e652585d4908e060306cb2a3579e2b15b15d0c2b217f5
-DIST pacemaker-1.1.7.tar.gz 9207389 SHA256 acf02495a24efbe21c18d1f4a2289b4e91374fd56c0ceaaa402ae1cf88219861 SHA512 9201fa677e7d2c8b0e926df92a735797cdc206b171e60d205ea997686598a1680dead9a33f617822fcbc998040c9df464052b86824635173926f250ae00d6e81 WHIRLPOOL 5e7178c4c660b0019862189f39e853457b8cddd9140b4d5c0b2c8925f970a521d8ac258183d0f70a11e2b8a734fa88c66244b0a00dded078042793d9cc4cfbc8
-DIST pacemaker-1.1.8.tar.gz 9410292 SHA256 d3a2b70968f01fefaa44c1256ced6bf427c42cd7a43fea2f3904ff42835ed449 SHA512 236ef0b50bf1c1352977e8a72296e3d79105e6ee35c50893acf4f4ec0ff36701b920d5f5ff05693a7ed2d0a13a82c67ef8c4b3468c2aec51e660a789f22ff9c6 WHIRLPOOL 5c28cd0b806cf6c41c2aa68865855084f1733e9b5f09ae03fc965e7e3ce4b5baaa1c0df3f9c03205fa7fe431ef193de9ba9fa226ba4bda89f061f3997f618a43
 EBUILD pacemaker-1.0.10.ebuild 1821 SHA256 41dddec72a5191be4e23813b97c86d1e89e0f99f846fd16c60772305453cae44 SHA512 c1027dc88f9ae5f28d6345708f6acbf23d4f743ed1e3e06bbc98ebae9acf0fcdc6181daa9f17a4fe9a8f3fef980d7c00d2897bc7e15f12c6f03a148d06dbc913 WHIRLPOOL b9ddd7393ca68564a06e9c3ce5ba46774e645a623d1607b5939c6eb86e2faa82ae0a7023aca27b73f3136156cb60d0da65a63523fdb28afdf7843d8fe727f7f4
 EBUILD pacemaker-1.0.12.ebuild 1791 SHA256 0b5b4b664f6719abbaca3175015d4fc344424360e7651fe4815029f96e302a9c SHA512 c467e326f50922a3c84139c40a567596ec8d81a1c312972a4069c5d6bdd9c5545c55ad48466c139b7352f456d3633fa77bec886202173d1e147cc400646dcb55 WHIRLPOOL 9672495439b1fd1b2f814e8a12bcf71e53edea992399fc7b6416cee195540647a4f6aca243757dac3744673cade98a150f5b0891c91393141ab3eefdfc40dce0
-EBUILD pacemaker-1.1.10.ebuild 2258 SHA256 6c45728ae4f164bcb8c7ed42e3117bff9721f8a24016fe4445c8cd60f97e5104 SHA512 9745e9bd27ba22db9b39eb7b428ebe3840a05ed00271d344f0346a713ee6408e0a026cab15ec0ef7003dcecad9a2b2e87f53020bebfe31b5168b218ceca1efd2 WHIRLPOOL 7d89d5d1e85742af32294b4abef575f465b1123abee1d10ca691086d25b81b7f30c7104527ea585b703c7329b799a4f81f11dfcab178e3c95af2448630a09edc
-EBUILD pacemaker-1.1.7.ebuild 2395 SHA256 20f73d0893af5dbdd7f59d43f9dbcb2683dbcdd68382ebe1ab7d44d370d4a0a9 SHA512 8990533ff38a2a9d85193a676ea635a608cd6b0299a22f051af24a362ce3545af2614b35140b534084cabf858a320cb82f7719051076c4b913e41bd43841bb09 WHIRLPOOL 63f4dd1869be24767b2c54fa34b3746222713def5e4bb3c5c7d64a49e2c6cf4f7966938796092e104e2cd0bafed4fcda81b7dde576d5e4a3c0604691816ef6f5
-EBUILD pacemaker-1.1.8-r2.ebuild 2163 SHA256 7a0992cfb8e5e297b60eb8cd878cce18135dc1efddd4559098eafd98d7cfe0b3 SHA512 7a705daf3deb83807cccc07a764cfb96542bad971d19b5416f9c7ba5483ab34ca9bfafe0d6d91dc8b4d43c406a6f8d0a4118661ddd690c7613b1ad73f437e29f WHIRLPOOL 506771de2719351986e8c61233d0b970138d2a9ec842a9fefa0b9e9910d187e04149645d7eba984bf06ca13eb879fef2f089759acc67716b40b9bafdc8d38295
-MISC ChangeLog 6708 SHA256 04226469eeaecbbda2c813150dba7681c575549f648438cf98396abf5bfdeb59 SHA512 b9206faac8d1fcf623cb78b0a71d177eb82d8e5659b311c3402cc874064a1010f31943061453627ac3ceb8d6fd78359c6a18db68d61accf9932214cb75551cd6 WHIRLPOOL cfc0251e268bac2af658bfffc5f7f517cd9576a25a2f7fc8ff9268c07bb335ec3a0d6a7688ed5a6c046c78d4abc7cbfbb41b013212d1d0f3cbbba74cd7af1797
+EBUILD pacemaker-1.1.10.ebuild 2338 SHA256 53a1342ca827d4484068c5a145c3b6fb8bc974a433d6250135f897f7dc83f024 SHA512 4d6f3b3593261e191bcafb37b7b5f53482d1898c94960898fedac9ff36948ff3d667c0426fd5393aeaea458422c69967c20d7819bfa0cf81437190fab59a7994 WHIRLPOOL 611280eb890842b8d52a0cf905deb5c819a0797d78bf9b049610ff51b78d8f307d7ac2343c6c2bfe399835b3f10635ebc63df1c3b2a5130d386cf6970c777de7
+EBUILD pacemaker-1.1.12.ebuild 2274 SHA256 5e802a42d3b2721d950aacdae54bd0dbb051f3c8e7edffbc09a0cf1d24bf7bec SHA512 84bfdb4de1f9637ecaf669d2ad4e8e470feb94819bd2b06b3792ff16eb742b1b2a75387231d096c728f3e5f192fa2d266d00217dad08579b7efb7629045caccd WHIRLPOOL 40c0d8c5b198038aa62c3124e3e4184534731d16f11f48f454fd27e84d8bc07bcd15d27ae7cdc733da6783bab966ae00d34c3fcd2b32abd3b9f5bb2a715368e6
+MISC ChangeLog 6974 SHA256 d9802f3ea1d79754a06f5107fcde57d62ba64d3e2b13e08dc72511a6e95693f0 SHA512 1e4b1198e1032750de080f78cc094c64376d425617239ea335a808ef1abe40fab2cbffa5d1d6854ba7628278188be539e27d9bf23ad78827bc4b9cf19df97500 WHIRLPOOL 20871fd359214fcf900c1555aec230a1d23c138bb01f53630fbd9552c58395882fdab6a9855f8cbfb69fcb9aa8c2571f6b54116323ac99fd0540779e9405cea8
 MISC metadata.xml 870 SHA256 ca8b9f3af29de78a1e6196cd392c6c85635f8f7fb2303befc762bd135439fd3b SHA512 57a334af692d25bd670f652d03aec50db6b19676910f8f988fff1f3e84af5d6c379204ee277eafcc8f570ad15445ce6364c9643f2d58540f9ee98b12ce9524c8 WHIRLPOOL 2e278c69b2f24eb38b876f832292bedcf2729252e36584c42a8438a965661bc63d87affe3e5e3e09b53b75a7e2f88e31f92edd857b1ff5ea897f47b286567c2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlR90JAACgkQKiQSS7ZY+hNjwwEAq6QVn228cH8RPbim9z3ZOeaZ
-dUmF2eWAOV+1qv8C5bEBAJKH7Jqb16qXe9kqDnQVRqQ6SY3cFflsoTGr74Pzi2tJ
-=FwwN
+iF4EAREIAAYFAlSK8H8ACgkQKiQSS7ZY+hOAJAD6Az/0u/Ei9RHZF55Tkg32m3V+
+hYkFRa5eb5kVYaZu3ZIBANv6+OkHv41EcRUdKffHr15CzZr1Hbyzq8ZPR85tjBjS
+=h5Bn
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch
new file mode 100644
index 000000000000..1dba440c9e79
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac	2014-12-12 14:13:07.262413254 +0100
++++ b/configure.ac	2014-12-12 14:13:14.922480835 +0100
+@@ -885,14 +885,16 @@
+ CURSESLIBS=''
+ if test "$ac_cv_header_ncurses_h" = "yes"; then
+   AC_CHECK_LIB(ncurses, printw,
+-    [CURSESLIBS='-lncurses'; AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
++    [AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
+   )
++  CURSESLIBS=`$PKGCONFIG --libs ncurses`;
+ fi
+ 
+ if test "$ac_cv_header_ncurses_ncurses_h" = "yes"; then
+   AC_CHECK_LIB(ncurses, printw,
+-    [CURSESLIBS='-lncurses'; AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
++    [AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
+   )
++  CURSESLIBS=`$PKGCONFIG --libs ncurses`;
+ fi
+ 
+ dnl Only look for non-n-library if there was no n-library.
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild
index f935ce715afc..06a5fca6d93e 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild,v 1.1 2013/08/29 10:32:25 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild,v 1.2 2014/12/12 13:41:15 ultrabug Exp $
 
 EAPI="5"
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
 WANT_AUTOMAKE="1.12"
 
-inherit autotools base python
+inherit autotools base python-single-r1
 
 MY_PN="Pacemaker"
 MY_P=${MY_PN}-${PV/_/-}
@@ -35,6 +35,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=("${FILESDIR}"/pacemaker-1.1.10-tinfo.patch)
+
 S="${WORKDIR}/${PN}-${MY_P}"
 
 pkg_setup() {
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.8-r2.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.12.ebuild
index bd5c9d9a41b6..42d5718243e0 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.8-r2.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.12.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.8-r2.ebuild,v 1.1 2013/04/23 08:04:02 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.12.ebuild,v 1.1 2014/12/12 13:41:15 ultrabug Exp $
 
-EAPI=4
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+WANT_AUTOMAKE="1.12"
 
-PYTHON_DEPEND="2"
+inherit autotools base python-single-r1
 
-inherit autotools base python
-
-MY_PN=Pacemaker
-MY_P=${MY_PN}-${PV}
-MY_TREE="1f8858c"
+MY_PN="Pacemaker"
+MY_P=${MY_PN}-${PV/_/-}
 
 DESCRIPTION="Pacemaker CRM"
 HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/tarball/${MY_P} -> ${P}.tar.gz"
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -36,22 +35,16 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PV}-backwards_compatibility.patch
-	)
-
-S="${WORKDIR}/ClusterLabs-${PN}-${MY_TREE}"
+PATCHES=("${FILESDIR}"/pacemaker-1.1.10-tinfo.patch)
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
+S="${WORKDIR}/${PN}-${MY_P}"
 
 src_prepare() {
 	base_src_prepare
 	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -e "s:<glib/ghash.h>:<glib.h>:" \
-		-i lib/ais/plugin.c || die
+	sed -i -e "s/ -ggdb//g" configure.ac || die
+	sed -i -e "s/uid2username(uid)/uid2username(uid_client)/g" lib/common/ipc.c || die
+	sed -i -e "s:<glib/ghash.h>:<glib.h>:" lib/ais/plugin.c || die
 	eautoreconf
 	python_convert_shebangs -r 2 .
 }
@@ -65,6 +58,7 @@ src_configure() {
 	fi
 	# appends lib to localstatedir automatically
 	econf \
+		--libdir=/usr/$(get_libdir) \
 		--localstatedir=/var \
 		--disable-dependency-tracking \
 		--disable-fatal-warnings \
@@ -80,7 +74,7 @@ src_configure() {
 
 src_install() {
 	base_src_install
-	rm -rf "${D}"/var/run
+	rm -rf "${D}"/var/run "${D}"/etc/init.d
 	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
 	if has_version "<sys-cluster/corosync-2.0"; then
 		insinto /etc/corosync/service.d
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild
deleted file mode 100644
index 1d5071d6728f..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild,v 1.5 2013/03/08 17:57:03 ultrabug Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit autotools base python
-
-MY_PN=Pacemaker
-MY_P=${MY_PN}-${PV}
-MY_TREE="b5b0a7b"
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/tarball/${MY_P} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="acl cman heartbeat smtp snmp static-libs"
-
-DEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	sys-cluster/resource-agents
-	cman? ( sys-cluster/cman )
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PV}-glibc2.16.patch )
-
-S="${WORKDIR}/ClusterLabs-${PN}-${MY_TREE}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -e "s:<glib/ghash.h>:<glib.h>:" \
-		-i lib/ais/plugin.c || die
-	eautoreconf
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	local myopts=""
-	use heartbeat || myopts="--with-ais"
-	# appends lib to localstatedir automatically
-	econf \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		$(use_with acl) \
-		$(use_with cman cs-quorum) \
-		$(use_with cman cman) \
-		$(use_with heartbeat) \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	base_src_install
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-	insinto /etc/corosync/service.d
-	newins "${FILESDIR}/${PN}.service" ${PN} || 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."
-}