summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2012-05-16 10:44:42 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2012-05-16 10:44:42 +0000
commit89cf81b8dd4a862b7068b934b05fff8ba1e4cf27 (patch)
treefc42ce95a56302089fbaad779cc81f4f27e92ac0 /sys-cluster/pacemaker
parentold (diff)
downloadhistorical-89cf81b8dd4a862b7068b934b05fff8ba1e4cf27.tar.gz
historical-89cf81b8dd4a862b7068b934b05fff8ba1e4cf27.tar.bz2
historical-89cf81b8dd4a862b7068b934b05fff8ba1e4cf27.zip
Fix building with glib-2.32, thanks to Marc Schiffbauer <mschiff@gentoo.org> for patch
Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64
Diffstat (limited to 'sys-cluster/pacemaker')
-rw-r--r--sys-cluster/pacemaker/ChangeLog8
-rw-r--r--sys-cluster/pacemaker/Manifest22
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild6
3 files changed, 26 insertions, 10 deletions
diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index f9be19336bbc..c1d2fba97303 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,10 @@
# 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.17 2011/10/24 11:25:48 ultrabug Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.18 2012/05/16 10:44:42 xarthisius Exp $
+
+ 16 May 2012; Kacper Kowalik <xarthisius@gentoo.org> pacemaker-1.1.6.1.ebuild:
+ Fix building with glib-2.32, thanks to Marc Schiffbauer <mschiff@gentoo.org>
+ for patch
24 Oct 2011; Ultrabug <ultrabug@gentoo.org> +pacemaker-1.1.6.1.ebuild,
metadata.xml:
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index ec3d917df718..07316214a113 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -16,13 +16,23 @@ EBUILD pacemaker-1.0.10.ebuild 1704 RMD160 6f11269269bf3ec33d8f9ac0ea91c3f43d273
EBUILD pacemaker-1.0.11.ebuild 1695 RMD160 d5fa6f353a4e7b08b3c2448068cd54b8e5aa6109 SHA1 93dfb0e07e33fdc3411121970112ca4d2b6041b3 SHA256 241df375f211ae31e5c77d17caf9b70798d90b121d47ecc31c2869a88781fab6
EBUILD pacemaker-1.1.4-r4.ebuild 2173 RMD160 b3680ec384fa9ab27a84a614e3a54c4a6264d118 SHA1 45b6705b10cfd8f45601b30fbe84bf579d83d894 SHA256 7c8aa067a3bdbffdf29ad4e9213b37b5281c4d0308884d766c11da60dc47336b
EBUILD pacemaker-1.1.5.ebuild 2174 RMD160 adfe3d30358c264bea2f53b7a061ba728c658ba6 SHA1 880295f039ca62aa0b7c0363a61552effb437807 SHA256 861f2c812dbcda44077669593d0b72681b93a30b798f921098dd063fde854c10
-EBUILD pacemaker-1.1.6.1.ebuild 2247 RMD160 af4be890aeebb4a6f74b36d35ee94a2efad99045 SHA1 cda0674c0a60722074bd3059d67af6ed1cfd7081 SHA256 6cf5f0062d235d80129c0715cf9ffaa972b1859af4694985ee732598b230d2e1
-MISC ChangeLog 3362 RMD160 7c25456f5af48101c75f278601a1bb7e5d9aa0f2 SHA1 725cdf4ab782ac6ddb0da67fcc03cc5a08ccb98c SHA256 f7743a3e2adeb8cc730ffa62c9eec26b2a0a5f54466a6cdfb09b5616aa73b89b
+EBUILD pacemaker-1.1.6.1.ebuild 2317 RMD160 8c691252d7d3c90c7c8fed078822ddd985258d14 SHA1 ebaaebdf17640fba24424f33895f4731593e39dd SHA256 b225517b61206b1a8308165496253b2c812e248eabb5f7e1bcf0ee8036eae36d
+MISC ChangeLog 3536 RMD160 43696a9dfe1ece445a0ce68d49dbf65af31cf022 SHA1 366b34a730d57bc19230e3736f445a8901d6d7f2 SHA256 51f352f7cd3afbb5c933e8d397d2095a17c9295bc4a1d66b0ad86416ceff0bfd
MISC metadata.xml 870 RMD160 eaebf5c9ba00ab06edbdd3d10fca4a5d85df3924 SHA1 824ec601ce5d08e2aa07471d4dab1307248ff06e SHA256 ca8b9f3af29de78a1e6196cd392c6c85635f8f7fb2303befc762bd135439fd3b
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAk6lS0UACgkQKiQSS7ZY+hPuRAD/XHSmHoN4fBxLjfa7rzDX0ASW
-Q1ySWRVx4fKBNliHhsEBAOi46y+YkaTzs4Ph+6HLzV35NYO3Fxu26hizresHLqEc
-=0HLP
+iQIcBAEBCAAGBQJPs4UrAAoJEF0huFKJUZL59ysP/jAFgC6YIjMxUKDM5XRs+tGc
+YnslHkhiDhAXrxMOz/mkRSdFJ7hnl/8hCeBCRJli67mD4hxHAeHhMJC4LCKBH2Ui
+PsEcylq6eHx2iy4uZ9KVlBmKdAQTxgTOFfubh6l2VTbaXK8nt5JEgIquqmR4e4E1
+8Bq6Jb65rop/mitVxB7mai6WUohapQF8FPI8B1cneSijd9JR2kGbFGpB46SQNY2h
+D7H1e0B4Y2VbGYGIBDLxSMXuvMjnOgCIL81VnWuT0hl1445ht++HBLOZdsO3Q3WV
+hx5xzebx2Alk2nRNWc8gATntYV/XWUiSBtxzOBt/e2yY8wgq56cTsvpr2/WbRnrI
+V9mR0UWBiGZnDvqDK47rQiYT6IAwiff08MxIq4GBnL6lIwmdu9r+3E1DmRzMpuxy
+sMCllkw4cjEAqPnwTwC+gqZleEHMG5AdB1lyikg++i7j71v6opHHHxSZ25kTAUNr
+70nWrPANyMuTCmPv9rGZG8+oSNPEVBJlOTTvge8j+CWkU+H7PtuwUhz8dCUv1s9X
+f2IMoqMHFIMnCFVRUbP6PdWdDUHhR7qdriUIPJ/YxuTsbRKQPlOiIjqFArrURWg5
+N2fRQ809nTph/oxiKz9sfYsZqfR1I/JqmspdZ+9WMu+u5Zujqls4xCXfUcc3R3nK
+x/taginDkcrvJu6xo05h
+=UIPP
-----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild
index f89b6ad0b471..a1ca98d13535 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.6.1.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.1.6.1.ebuild,v 1.1 2011/10/24 11:25:48 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild,v 1.2 2012/05/16 10:44:42 xarthisius Exp $
EAPI=4
@@ -44,6 +44,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
}