Backport glib-2.32 fix to 1.0.x ebuilds

Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64

4 files changed, 29 insertions, 11 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 7a903b8428dc..4cb483902852 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/pacemaker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.19 2012/05/16 15:08:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.20 2012/05/24 09:24:38 xarthisius Exp $
+
+  24 May 2012; Kacper Kowalik <xarthisius@gentoo.org> pacemaker-1.0.10.ebuild,
+  pacemaker-1.0.11.ebuild:
+  Backport glib-2.32 fix to 1.0.x ebuilds
 
 *pacemaker-1.1.7 (16 May 2012)
 
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index f066e51c9e3d..0d7a7b4081f6 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -9,16 +9,26 @@ DIST Pacemaker-1.0.10.tar.bz2 6642704 RMD160 9eaac150c7e3e7f2e1c00303025aa8fe5bf
 DIST Pacemaker-1.0.11.tar.bz2 6706773 RMD160 6ab3dbccf537a2b635a87b0089307b5309705df4 SHA1 7b3bb3401d9a9183130766625a0e8eb587f89b55 SHA256 568a8a7257ca9eb2d546c74fb18ee27d1e4e8eb58d9e2be0325cda1569b0ae75
 DIST pacemaker-1.1.6.1.tar.gz 8722056 RMD160 e85dcdb57ae6afd3e351052cabd7938e15b39034 SHA1 d4d95ac06ea742965696552ba41bc2a49a643b25 SHA256 57b962cce13ae2a11e2439fb6c88722233baac329b5a634a42e410f0ce8db059
 DIST pacemaker-1.1.7.tar.gz 9207389 RMD160 8e0c8ef26572c3542ce57468803301cb9918df2b SHA1 92e4b381dfac4a90eefdf654ba216f2cb4f983b0 SHA256 acf02495a24efbe21c18d1f4a2289b4e91374fd56c0ceaaa402ae1cf88219861
-EBUILD pacemaker-1.0.10.ebuild 1704 RMD160 6f11269269bf3ec33d8f9ac0ea91c3f43d273644 SHA1 8ea2440ed206ecf371ee5d2937d0589776a8008e SHA256 fc5b74f7ee393bf6875591f9a7f34b9d2fe49ba52b79d58e2ed6478bc838d28b
-EBUILD pacemaker-1.0.11.ebuild 1695 RMD160 d5fa6f353a4e7b08b3c2448068cd54b8e5aa6109 SHA1 93dfb0e07e33fdc3411121970112ca4d2b6041b3 SHA256 241df375f211ae31e5c77d17caf9b70798d90b121d47ecc31c2869a88781fab6
+EBUILD pacemaker-1.0.10.ebuild 1779 RMD160 c8216432b08c797b784563429eeb3bd42bfd9a19 SHA1 5de63be100b9b9fe05478a80d97d9ea2fae4b6d6 SHA256 642b4687ce2abdbba8fcad04fc6c76f1aa3ddae94a84e4b85081524b87b7a65c
+EBUILD pacemaker-1.0.11.ebuild 1763 RMD160 15700a98fdffd95d78ab10a83cbf925de5ae3908 SHA1 c419add1ffcbaccf4e27093890674c45357fd731 SHA256 693a452ee09487ab23cc7a0e83f78249eb962644637ff4d1c68337ab93e9f5ed
 EBUILD pacemaker-1.1.6.1.ebuild 2317 RMD160 8c691252d7d3c90c7c8fed078822ddd985258d14 SHA1 ebaaebdf17640fba24424f33895f4731593e39dd SHA256 b225517b61206b1a8308165496253b2c812e248eabb5f7e1bcf0ee8036eae36d
 EBUILD pacemaker-1.1.7.ebuild 2313 RMD160 b57ecad12278f19db7fac48de05ace8fa2fa777b SHA1 e8202d7c7bc32904e3750327cc86ded3acaf0a6b SHA256 5bdb49b6bb2f12f366f64fcc87a53e6fcfbc72f01722185ca87ffb9548f423ab
-MISC ChangeLog 3817 RMD160 a7626481dab9a12f1e66358a029cf7850d9425c1 SHA1 e9a90d09685058175ba0ebc2d0c695346a88ee4c SHA256 6454f97239bf73c5a3dfd923ff6e8dd70c90f6b7c5aadbb60dd44820dbe6dd96
+MISC ChangeLog 3968 RMD160 5fc6572481a3eb94ed73345c59633a840bf5a85b SHA1 c47566861e873ac8afb0b5c79b3037d445299053 SHA256 4cfa02c1c5fb85170c7c70a4a86d641c29e103eda43b080ddf725cde418a2eff
 MISC metadata.xml 870 RMD160 eaebf5c9ba00ab06edbdd3d10fca4a5d85df3924 SHA1 824ec601ce5d08e2aa07471d4dab1307248ff06e SHA256 ca8b9f3af29de78a1e6196cd392c6c85635f8f7fb2303befc762bd135439fd3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk+zwvQACgkQKiQSS7ZY+hNOWAD5AVs4ZphGiPu2kUCFOXMKDDt7
-S+sNmC6KZwnSZX9xBKkA/jPhoubJdPre5DgZYGaDxKNM5NA8xQBr7gen2G909zGw
-=udWf
+iQIcBAEBCAAGBQJPvf5vAAoJEF0huFKJUZL5uBsQAKMIFIS4oJv00vZDS8lIzXV2
+y8NlU+D82pngroCSRxYLYktjK14wQsGolOSKWL1sjo+NLVpSoRi9kCjc7lmp9176
+laKQ5CO7kAx7gVFCZHXhUjTX5o9CQma4vE6GDR2g070xATpCW8GrRoWNgHoMgwgk
+X4TJRnROUjHRLzJAhvCsu5b+MK2lOhGqSs6BPDYcFjVvnrwM4F2A1/uY612Efl7X
+7OpKph60qAfN2ZBQCPUFmzXICBh9ImcOz3dN/nhfrn8Qq5TWu8dezdCaiCG5jx58
+ioWu1cDn6SN9aLf7BJHgcTtLXZ4mFtRDMSkaBFFoCg6LL+azzDTm/1EIsPhFFH/3
+ogweJ8fyy6ztBNLyEv9vfaZfDxKdOm1evDstFja/iM8H9GbW+/ro9RAX7fKoOUMA
+H9VKkLjQw+BJ+hvAhb0HgyhUFEJad+Tcaa6KGbfn7WX8Rw1aD+c63JIrEej4E28N
+5Be54Q1D7U0fCu0JYwAZzRtJfVHySJbq3r7qZHNOVPd9v+Mgmy3sAovdI3bSOF70
+TrHVDQTblzMAx01P2WYoB/888AhODUfb9Eq3HV2s24SUN9kaaBCXlD776VJo0/Yb
+1KhZRX07ntxCDHxPw3trrth4Sl8/Qfge1jY9Im22DYqgeIwCPYS+1uWzZGD6EOOX
+cF3rdEPOP33I5WZ70x/5
+=tqXV
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
index e6d6b226e7dd..0fab9b8d90f2 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-2011 Gentoo Foundation
+# Copyright 1999-2012 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.4 2011/02/21 08:38:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild,v 1.5 2012/05/24 09:24:38 xarthisius Exp $
 
 EAPI="2"
 
@@ -50,6 +50,8 @@ 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
 }
 
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild
index 61bae38013b9..29cf1891bc6c 100644
--- a/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild,v 1.2 2011/07/08 14:02:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild,v 1.3 2012/05/24 09:24:38 xarthisius Exp $
 
 EAPI="2"
 
@@ -51,6 +51,8 @@ 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
 }