fix #441730 on pacemaker-1.0.x

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

4 files changed, 21 insertions, 13 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index d55501f954ac..759a1b2fd421 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,10 @@
 # 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.31 2013/04/17 12:53:39 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.32 2013/04/18 09:53:17 ultrabug Exp $
+
+  18 Apr 2013; Ultrabug <ultrabug@gentoo.org> pacemaker-1.0.10.ebuild,
+  pacemaker-1.0.12.ebuild:
+  add blockers for glib-2.32* on pacemaker-1.0.x wrt #441730
 
 *pacemaker-1.1.10_rc1 (17 Apr 2013)
 
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 871ea2b5e586..97d93a8050a8 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -13,17 +13,17 @@ DIST Pacemaker-1.1.10-rc1.tar.gz 10125513 SHA256 152b3f7f2b13f85853dcc8198eb0158
 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 1779 SHA256 642b4687ce2abdbba8fcad04fc6c76f1aa3ddae94a84e4b85081524b87b7a65c SHA512 89deb4b02e43509591b1d62696a1e64a0e7ba31884124e1f9d9b89b27c579723d57ad931a6c12d263535b34c3bfa93b1a531731ed0b8f85d9744f08e511879bd WHIRLPOOL 06192033358d9700a3d786bffb074d1708f49e907ef2e9ac39f62a8ace867700b651275be7891dca7e9d1d8d46198c9cca26c0493e9416045648fbb9e45466ea
-EBUILD pacemaker-1.0.12.ebuild 1748 SHA256 d2e1d4c2e6856d1e5acb946a7b3e350c2f53df7a27e317e81578cb7ac8fd7fc8 SHA512 a759d7d97e75f0735275c3fa42c61481ca2ca92c8f1b2de6006c630e913de1e57f90289264ae5c4967eacee7c83707780d3b8969bddb41dcfe11dc0660c2dab6 WHIRLPOOL 9cedbfff135b60dfa5c27b2199d9a0291430f1a1cbde76ae2d3dcc7b956107be43664e4d19043f8e20f1eaff278e706749c285874c6cdec47d8022ea55268870
+EBUILD pacemaker-1.0.10.ebuild 1801 SHA256 233d6c2d072be759f72e962305520111407f0d6e2fabd0ce9d924fcb7dd6d3dd SHA512 6c50a492a22e594d6eb53d4710c22206d4d6eaa1f1224660f9f9d4dd57d7c5a7ef9851ecda6dd27acd34279e86d7a29e884aeb70ffad1d43df1d38deb955f2bb WHIRLPOOL dae4680b1e906c42951994d82c4c75ecd7c89531cc5b5e195d0afe201fcf433eca5d9d2940bb63a2f59fa4e309996bfb660f4f7bdbe0af9d7a03f29f1a0bd482
+EBUILD pacemaker-1.0.12.ebuild 1771 SHA256 e573d6710092d1fbf84a5543bb70801d97179507db3f74c73db20bbfd5e3923a SHA512 afb8764a6bce320eb2552d63d94ce58c6d5b41ca2e39bc578fdc28fe8edde85c3c876e274d73c11235a044a3d35f94a4d997faa418e84bfacf7e497c1766f597 WHIRLPOOL b431ccb58cd9285e6eb0170e9d6adc729fb812caa68f9cbb3d3ae4fac8c85dabb5e8059dc21d650f28aa519eb400634050c83dda78b53c81a13f0317086aa4b2
 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
-MISC ChangeLog 6024 SHA256 365f25ec88e1c0aca033549ba52a3486938a03a9435f6631cd975ed8ddda51a5 SHA512 2ebb2c30129a92d2d25a550ab211c340e233ab0066a6c2535ebbb69ac6baf9b08e591744ba9ad4d0b5979f8f727a4b32fe3cb1713801f2f2206b03524527379b WHIRLPOOL ba8aad18bf6945f0681411d2ff70f4a5880fbe90cf32da8e95b5352d198d1abd0e6691a01970041f7ed6dd79d8abc389a956be9c58102a2f5e305d67b21432e8
+MISC ChangeLog 6184 SHA256 9b22be83bca041bad8e3c156f00458ab1637d07e2a6ea555cc2c6166efb30677 SHA512 b28ce4ea82c11d701396ec356e103fca08167d7acf87ac1905a4c85f8b0fb71ef897da368587b75b224e56b0d7db89791296af26a25585b28f6f957f4c3bb4a9 WHIRLPOOL f234b552610d943dd2052cd3ce7b632c2414cd4632bb897aad94e1786a9da7d9e8aeb63d826ea5f87b8be25713bc27f2a54d9198fe717ed78408ec2879cebd9a
 MISC metadata.xml 870 SHA256 ca8b9f3af29de78a1e6196cd392c6c85635f8f7fb2303befc762bd135439fd3b SHA512 57a334af692d25bd670f652d03aec50db6b19676910f8f988fff1f3e84af5d6c379204ee277eafcc8f570ad15445ce6364c9643f2d58540f9ee98b12ce9524c8 WHIRLPOOL 2e278c69b2f24eb38b876f832292bedcf2729252e36584c42a8438a965661bc63d87affe3e5e3e09b53b75a7e2f88e31f92edd857b1ff5ea897f47b286567c2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFum1kACgkQKiQSS7ZY+hPYWgD/Yzsof9IoVfjDZJWPrhC5ae4N
-bInT6EAU4rnbYqhvn7ABAJkvkkVVGNJ3EId9A9lpSzp/c7PkQT2G+DvFqUPtEhCu
-=p8HE
+iF4EAREIAAYFAlFvwpMACgkQKiQSS7ZY+hM1ggD7Bghik0zWJT9gdpxueUiYmT0C
+SREh20jQ5Q7tzMjrHMgA/RZwWUQCMqPeq2F7qb/ktjXAtFD6IngfDGpPX43VYg7S
+=OM6D
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
index 0fab9b8d90f2..7123ac3f0640 100644
--- a/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.0.10.ebuild,v 1.5 2012/05/24 09:24:38 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild,v 1.6 2013/04/18 09:53:17 ultrabug Exp $
 
 EAPI="2"
 
@@ -28,7 +28,9 @@ RDEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	!heartbeat? ( !ais? ( sys-cluster/openais ) )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	!=dev-libs/glib-2.32*
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.10-asneeded.patch"
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
index e760992d7724..41099bcd708c 100644
--- a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.0.12.ebuild,v 1.2 2012/07/11 16:05:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild,v 1.3 2013/04/18 09:53:17 ultrabug Exp $
 
 EAPI="2"
 
@@ -31,7 +31,9 @@ DEPEND="
 	smtp? ( net-libs/libesmtp )
 	snmp? ( net-analyzer/net-snmp )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!=dev-libs/glib-2.32*
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.10-asneeded.patch"