summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2013-04-17 12:53:39 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2013-04-17 12:53:39 +0000
commit7bda758dd0509209e1e3d683066afc7f45733b84 (patch)
tree459fe40c227f63296c1706b3b9162c0084852a44 /sys-cluster/pacemaker
parentRemove old stable (diff)
downloadgentoo-2-7bda758dd0509209e1e3d683066afc7f45733b84.tar.gz
gentoo-2-7bda758dd0509209e1e3d683066afc7f45733b84.tar.bz2
gentoo-2-7bda758dd0509209e1e3d683066afc7f45733b84.zip
version bump, drop bugged version
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'sys-cluster/pacemaker')
-rw-r--r--sys-cluster/pacemaker/ChangeLog8
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild (renamed from sys-cluster/pacemaker/pacemaker-1.1.9.ebuild)29
2 files changed, 18 insertions, 19 deletions
diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 7bbd09f70e80..d55501f954ac 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,12 @@
# 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.30 2013/03/13 13:48:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.31 2013/04/17 12:53:39 ultrabug Exp $
+
+*pacemaker-1.1.10_rc1 (17 Apr 2013)
+
+ 17 Apr 2013; Ultrabug <ultrabug@gentoo.org> -pacemaker-1.1.9.ebuild,
+ +pacemaker-1.1.10_rc1.ebuild:
+ drop bugged version, version bump
*pacemaker-1.1.9 (13 Mar 2013)
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.9.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild
index 54400caed641..940dfd707b56 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.9.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild
@@ -1,26 +1,25 @@
# 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.1.9.ebuild,v 1.1 2013/03/13 13:48:26 ultrabug Exp $
-
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild,v 1.1 2013/04/17 12:53:39 ultrabug Exp $
+EAPI="5"
PYTHON_DEPEND="2"
+WANT_AUTOMAKE="1.12"
inherit autotools base python
-MY_PN=Pacemaker
-MY_P=${MY_PN}-${PV}
-MY_TREE="2a917dd"
+MY_PN="Pacemaker"
+MY_P=${MY_PN}-${PV/_/-}
DESCRIPTION="Pacemaker CRM"
HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/tarball/${MY_P} -> ${P}.tar.gz"
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="-acl cman heartbeat smtp snmp static-libs"
+IUSE="acl cman heartbeat smtp snmp static-libs"
DEPEND="
app-text/docbook-xsl-stylesheets
@@ -37,7 +36,7 @@ DEPEND="
RDEPEND="${DEPEND}"
PDEPEND="sys-cluster/crmsh"
-S="${WORKDIR}/ClusterLabs-${PN}-${MY_TREE}"
+S="${WORKDIR}/${PN}-${MY_P}"
pkg_setup() {
python_set_active_version 2
@@ -47,8 +46,9 @@ 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
+ sed -i -e "s/ -ggdb//g" configure.ac || die
+ sed -i -e "s/uid2username(uid)/uid2username(uid_client)/g" lib/common/ipc.c || die
+ sed -i -e "s:<glib/ghash.h>:<glib.h>:" lib/ais/plugin.c || die
eautoreconf
python_convert_shebangs -r 2 .
}
@@ -85,10 +85,3 @@ src_install() {
newins "${FILESDIR}/${PN}.service" ${PN} || die
fi
}
-
-pkg_postinst() {
- if use acl ; then
- ewarn "ACL support requires you to add root to the haclient group !"
- ewarn " # usermod -a -G haclient root"
- fi
-}