diff options
author | Alexys Jacob <ultrabug@gentoo.org> | 2014-12-02 14:45:32 +0000 |
---|---|---|
committer | Alexys Jacob <ultrabug@gentoo.org> | 2014-12-02 14:45:32 +0000 |
commit | 8a2d8ff168eb7ae364842b1bf639939fcd721524 (patch) | |
tree | 022bb61aff768ca5446c03e09a56dd0d6376c1a8 /sys-cluster | |
parent | version bump, drop old (diff) | |
download | gentoo-2-8a2d8ff168eb7ae364842b1bf639939fcd721524.tar.gz gentoo-2-8a2d8ff168eb7ae364842b1bf639939fcd721524.tar.bz2 gentoo-2-8a2d8ff168eb7ae364842b1bf639939fcd721524.zip |
fix #454056
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/pacemaker/ChangeLog | 8 | ||||
-rw-r--r-- | sys-cluster/pacemaker/pacemaker-1.0.10.ebuild | 5 | ||||
-rw-r--r-- | sys-cluster/pacemaker/pacemaker-1.0.12.ebuild | 5 |
3 files changed, 12 insertions, 6 deletions
diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog index 294299a95f26..72b4dea40d6a 100644 --- a/sys-cluster/pacemaker/ChangeLog +++ b/sys-cluster/pacemaker/ChangeLog @@ -1,6 +1,10 @@ # 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.34 2013/08/29 10:32:25 ultrabug Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.35 2014/12/02 14:45:32 ultrabug Exp $ + + 02 Dec 2014; Ultrabug <ultrabug@gentoo.org> pacemaker-1.0.10.ebuild, + pacemaker-1.0.12.ebuild: + add blocker wrt #454056 *pacemaker-1.1.10 (29 Aug 2013) diff --git a/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild index 7123ac3f0640..c7615ae76c55 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-2013 Gentoo Foundation +# Copyright 1999-2014 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.6 2013/04/18 09:53:17 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild,v 1.7 2014/12/02 14:45:32 ultrabug Exp $ EAPI="2" @@ -27,6 +27,7 @@ RDEPEND=" smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) !heartbeat? ( !ais? ( sys-cluster/openais ) ) + !sys-cluster/crmsh " DEPEND="${RDEPEND} !=dev-libs/glib-2.32* diff --git a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild index 41099bcd708c..c39da3eb9127 100644 --- a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild +++ b/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild,v 1.3 2013/04/18 09:53:17 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild,v 1.4 2014/12/02 14:45:32 ultrabug Exp $ EAPI="2" @@ -30,6 +30,7 @@ DEPEND=" !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) + !sys-cluster/crmsh " RDEPEND="${DEPEND} !=dev-libs/glib-2.32* |