summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-cluster/pacemaker/ChangeLog7
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild6
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.7.ebuild6
3 files changed, 14 insertions, 5 deletions
diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 4cb483902852..34b7bfd089cc 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,11 @@
# 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.20 2012/05/24 09:24:38 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.21 2012/05/30 14:55:32 xarthisius Exp $
+
+ 30 May 2012; Kacper Kowalik <xarthisius@gentoo.org> pacemaker-1.1.6.1.ebuild,
+ pacemaker-1.1.7.ebuild:
+ Define PYTHON_DEPEND before inheriting python.eclass and convert shebangs to
+ python2 wrt #418237 by Marcin Mirosław <bug@mejor.pl>
24 May 2012; Kacper Kowalik <xarthisius@gentoo.org> pacemaker-1.0.10.ebuild,
pacemaker-1.0.11.ebuild:
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild
index a1ca98d13535..62720a8101e6 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild
@@ -1,15 +1,16 @@
# 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.2 2012/05/16 10:44:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild,v 1.3 2012/05/30 14:55:32 xarthisius Exp $
EAPI=4
+PYTHON_DEPEND="2"
+
inherit autotools base python
MY_PN=Pacemaker
MY_P=${MY_PN}-${PV}
MY_TREE="0c7312c"
-PYTHON_DEPEND="2"
DESCRIPTION="Pacemaker CRM"
HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
@@ -47,6 +48,7 @@ src_prepare() {
sed -e "s:<glib/ghash.h>:<glib.h>:" \
-i lib/ais/plugin.c || die
eautoreconf
+ python_convert_shebangs -r 2 .
}
src_configure() {
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild
index 8504ec5aeb4f..8d31f01ca4c7 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild
@@ -1,15 +1,16 @@
# 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.7.ebuild,v 1.1 2012/05/16 15:08:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild,v 1.2 2012/05/30 14:55:32 xarthisius Exp $
EAPI=4
+PYTHON_DEPEND="2"
+
inherit autotools base python
MY_PN=Pacemaker
MY_P=${MY_PN}-${PV}
MY_TREE="b5b0a7b"
-PYTHON_DEPEND="2"
DESCRIPTION="Pacemaker CRM"
HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
@@ -47,6 +48,7 @@ src_prepare() {
sed -e "s:<glib/ghash.h>:<glib.h>:" \
-i lib/ais/plugin.c || die
eautoreconf
+ python_convert_shebangs -r 2 .
}
src_configure() {