summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2012-05-24 09:24:38 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2012-05-24 09:24:38 +0000
commit83b37e56949089c9a8376487c3c085148f1c432b (patch)
tree8154e2df4db62b2061a1ea3f369e1dda38303a50 /sys-cluster/pacemaker
parentStable for x86, wrt bug #414605 (diff)
downloadgentoo-2-83b37e56949089c9a8376487c3c085148f1c432b.tar.gz
gentoo-2-83b37e56949089c9a8376487c3c085148f1c432b.tar.bz2
gentoo-2-83b37e56949089c9a8376487c3c085148f1c432b.zip
Backport glib-2.32 fix to 1.0.x ebuilds
(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster/pacemaker')
-rw-r--r--sys-cluster/pacemaker/ChangeLog6
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.0.10.ebuild6
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.0.11.ebuild6
3 files changed, 13 insertions, 5 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/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
}