version bump, drop bugged version

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

3 files changed, 24 insertions, 25 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 7bbd09f70e80..d55501f954ac 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/pacemaker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.30 2013/03/13 13:48:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.31 2013/04/17 12:53:39 ultrabug Exp $
+
+*pacemaker-1.1.10_rc1 (17 Apr 2013)
+
+  17 Apr 2013; Ultrabug <ultrabug@gentoo.org> -pacemaker-1.1.9.ebuild,
+  +pacemaker-1.1.10_rc1.ebuild:
+  drop bugged version, version bump
 
 *pacemaker-1.1.9 (13 Mar 2013)
 
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 46e766e50751..871ea2b5e586 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -9,21 +9,21 @@ AUX pacemaker-1.0.10-installpaths.patch 200 SHA256 4b8d82244123f88491b7deecb99b2
 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-rc1.tar.gz 10125513 SHA256 152b3f7f2b13f85853dcc8198eb01589e943bb1df55f4611b2b215cd8d47cd10 SHA512 a2769c5104632579e71966b398c76323e5c4861701366414aa407ad820fbf0aeed5c152b79f4dd04ab1eb27e8946b9e4cd6697988ce00b09b389eabad1add80f WHIRLPOOL adb131de60ef18e7010b498e9637589b5d8054e4f3a2c3fe441844c4dd2e2b6fb461072388928c4847f13555e18f6aedacb717889e17480557e1a774ae6f4e06
 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
-DIST pacemaker-1.1.9.tar.gz 10011664 SHA256 1d11c2b23d978fca9743accdf9e1a415576225fe4dcfc518389875c89a280e18 SHA512 38a8923aff25f203a2e99fc3d29584524b2926f6dbed223d158a4e8bd10f77d9f34fddb1cdb6f7136a020ee2bd79a6cebc10602350be55a672804a2c0dd929f6 WHIRLPOOL e9088bb87af176f000eec5dfdb54d54bab262dc9a806b4b97b0d78d0302220821328c0c590c119d34f5972126bf8f7f6b97066d6930f639b45d3fc42905fb257
 EBUILD pacemaker-1.0.10.ebuild 1779 SHA256 642b4687ce2abdbba8fcad04fc6c76f1aa3ddae94a84e4b85081524b87b7a65c SHA512 89deb4b02e43509591b1d62696a1e64a0e7ba31884124e1f9d9b89b27c579723d57ad931a6c12d263535b34c3bfa93b1a531731ed0b8f85d9744f08e511879bd WHIRLPOOL 06192033358d9700a3d786bffb074d1708f49e907ef2e9ac39f62a8ace867700b651275be7891dca7e9d1d8d46198c9cca26c0493e9416045648fbb9e45466ea
 EBUILD pacemaker-1.0.12.ebuild 1748 SHA256 d2e1d4c2e6856d1e5acb946a7b3e350c2f53df7a27e317e81578cb7ac8fd7fc8 SHA512 a759d7d97e75f0735275c3fa42c61481ca2ca92c8f1b2de6006c630e913de1e57f90289264ae5c4967eacee7c83707780d3b8969bddb41dcfe11dc0660c2dab6 WHIRLPOOL 9cedbfff135b60dfa5c27b2199d9a0291430f1a1cbde76ae2d3dcc7b956107be43664e4d19043f8e20f1eaff278e706749c285874c6cdec47d8022ea55268870
+EBUILD pacemaker-1.1.10_rc1.ebuild 2189 SHA256 0e6500a085311e529ccdb483f5f892ee788efae2bf009f1995740fc290ab0114 SHA512 5fa1adf4c8dd77143bce00753b770ace257aba27f5538a526436b013fcb127225a8e4230ef05c7347147e76754e3ae2bcb40b771c8cd56472f1bd93bd5e66170 WHIRLPOOL d8d3d0aa33ba1680650c81d588fc4e66babb6fa8697fffd0da45cc01a9c019de5fcfcb08037fefee9bc7a5b9f57b03249db63fc0481868621c5770f04f3664fb
 EBUILD pacemaker-1.1.7.ebuild 2395 SHA256 20f73d0893af5dbdd7f59d43f9dbcb2683dbcdd68382ebe1ab7d44d370d4a0a9 SHA512 8990533ff38a2a9d85193a676ea635a608cd6b0299a22f051af24a362ce3545af2614b35140b534084cabf858a320cb82f7719051076c4b913e41bd43841bb09 WHIRLPOOL 63f4dd1869be24767b2c54fa34b3746222713def5e4bb3c5c7d64a49e2c6cf4f7966938796092e104e2cd0bafed4fcda81b7dde576d5e4a3c0604691816ef6f5
 EBUILD pacemaker-1.1.8-r1.ebuild 2090 SHA256 ca12218bcb887e835b2828c19d47a57a1ab565af0d8b2491c7bd018640478339 SHA512 9de8557da73ab28b12f5c3191bec3a2373bd8d2b1a23c15d5f51cad9ea2b87bf37390018b43e5c3c050c3cb897c7867c892090d473a2193e812805c3626f6de1 WHIRLPOOL e0ad33d98b47812363c90417e5c99ef0d431eaaa486b1b2d4040a21cd91f34f0d5a516bceac31f61a13a9b5daf11a07e0e42cb111211e9f91c2e0e3503811a45
-EBUILD pacemaker-1.1.9.ebuild 2231 SHA256 8ae2172a5516f5c9735dcb3518e8a72b313f348843fe17535f77e47686e29bbe SHA512 4352825cbbcdc6be0ea6ff550d60c8adaa5542c39485c65a9751ce6c9e274f94182dbbe959c794398af569bb08e29d8fe5a2824919bef6563b05060bc20586be WHIRLPOOL c3e610eb65e41cea0c35921e6a62f59f573c5919663c720f3b63aa90241f3813281afdb7cc58ea7449c104c9c6fbb1b3011280ff125d9d003195cb0f9f23bb8b
-MISC ChangeLog 5847 SHA256 89f2219babd3fa163b84de7b7712a3b76d564b8f716bd5c58a4ddfb57139f2f3 SHA512 3ea0dd4c90a6d152d6a2cf581d95c61d778a38a1e25b8eea21b9ef4f06e65b9d8fba8deb5207e411747adda1bfa27e22d8f9cb66d208696d440a74eaad4e25a7 WHIRLPOOL 05e5814e418968660145b77d8f15b5e073d91ba463cf8d4dd3939c932547a8fcdee0030c7ba5c34ac20ff56abdf313a5b59ec6a3cd2b6f226f547d14d8183287
+MISC ChangeLog 6024 SHA256 365f25ec88e1c0aca033549ba52a3486938a03a9435f6631cd975ed8ddda51a5 SHA512 2ebb2c30129a92d2d25a550ab211c340e233ab0066a6c2535ebbb69ac6baf9b08e591744ba9ad4d0b5979f8f727a4b32fe3cb1713801f2f2206b03524527379b WHIRLPOOL ba8aad18bf6945f0681411d2ff70f4a5880fbe90cf32da8e95b5352d198d1abd0e6691a01970041f7ed6dd79d8abc389a956be9c58102a2f5e305d67b21432e8
 MISC metadata.xml 870 SHA256 ca8b9f3af29de78a1e6196cd392c6c85635f8f7fb2303befc762bd135439fd3b SHA512 57a334af692d25bd670f652d03aec50db6b19676910f8f988fff1f3e84af5d6c379204ee277eafcc8f570ad15445ce6364c9643f2d58540f9ee98b12ce9524c8 WHIRLPOOL 2e278c69b2f24eb38b876f832292bedcf2729252e36584c42a8438a965661bc63d87affe3e5e3e09b53b75a7e2f88e31f92edd857b1ff5ea897f47b286567c2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFAg68ACgkQKiQSS7ZY+hPVQgEAs5i7bOJrMb8jDVqF/bWSNmSV
-Wlv/IFXnnFnRXfaWD9oBALQOHs1p+yZUqCcqDYDN11yI47zLWZNd7XBN8ZtCt3JG
-=wdHT
+iF4EAREIAAYFAlFum1kACgkQKiQSS7ZY+hPYWgD/Yzsof9IoVfjDZJWPrhC5ae4N
+bInT6EAU4rnbYqhvn7ABAJkvkkVVGNJ3EId9A9lpSzp/c7PkQT2G+DvFqUPtEhCu
+=p8HE
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.9.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild
index 54400caed641..940dfd707b56 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.9.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild
@@ -1,26 +1,25 @@
 # 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.9.ebuild,v 1.1 2013/03/13 13:48:26 ultrabug Exp $
-
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild,v 1.1 2013/04/17 12:53:39 ultrabug Exp $
 
+EAPI="5"
 PYTHON_DEPEND="2"
+WANT_AUTOMAKE="1.12"
 
 inherit autotools base python
 
-MY_PN=Pacemaker
-MY_P=${MY_PN}-${PV}
-MY_TREE="2a917dd"
+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"
 KEYWORDS="~amd64 ~hppa ~x86"
 REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="-acl cman heartbeat smtp snmp static-libs"
+IUSE="acl cman heartbeat smtp snmp static-libs"
 
 DEPEND="
 	app-text/docbook-xsl-stylesheets
@@ -37,7 +36,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 PDEPEND="sys-cluster/crmsh"
 
-S="${WORKDIR}/ClusterLabs-${PN}-${MY_TREE}"
+S="${WORKDIR}/${PN}-${MY_P}"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -47,8 +46,9 @@ 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
+	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 .
 }
@@ -85,10 +85,3 @@ src_install() {
 		newins "${FILESDIR}/${PN}.service" ${PN} || die
 	fi
 }
-
-pkg_postinst() {
-	if use acl ; then
-		ewarn "ACL support requires you to add root to the haclient group !"
-		ewarn "    # usermod -a -G haclient root"
-	fi
-}