diff options
| author |   Alexys Jacob <ultrabug@gentoo.org> | 2013-04-18 09:53:17 +0000 |
|---|---|---|
| committer | Alexys Jacob <ultrabug@gentoo.org> | 2013-04-18 09:53:17 +0000 |
| commit | bf21fa01e44a1737c5bd06e6bebc0e19c4a63064 (patch) | |
| tree | ee23868fef4be733e6977001ee22f326a5f43650 | |
| parent | Stable for alpha, wrt bug #465788 (diff) | |
| download | gentoo-2-bf21fa01e44a1737c5bd06e6bebc0e19c4a63064.tar.gz gentoo-2-bf21fa01e44a1737c5bd06e6bebc0e19c4a63064.tar.bz2 gentoo-2-bf21fa01e44a1737c5bd06e6bebc0e19c4a63064.zip | |
fix #441730 on pacemaker-1.0.x
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
| -rw-r--r-- | sys-cluster/pacemaker/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/pacemaker/pacemaker-1.0.10.ebuild | 8 | ||||
| -rw-r--r-- | sys-cluster/pacemaker/pacemaker-1.0.12.ebuild | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog index d55501f954ac..759a1b2fd421 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.31 2013/04/17 12:53:39 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.32 2013/04/18 09:53:17 ultrabug Exp $ + + 18 Apr 2013; Ultrabug <ultrabug@gentoo.org> pacemaker-1.0.10.ebuild, + pacemaker-1.0.12.ebuild: + add blockers for glib-2.32* on pacemaker-1.0.x wrt #441730 *pacemaker-1.1.10_rc1 (17 Apr 2013) diff --git a/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild index 0fab9b8d90f2..7123ac3f0640 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-2012 Gentoo Foundation +# 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.0.10.ebuild,v 1.5 2012/05/24 09:24:38 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild,v 1.6 2013/04/18 09:53:17 ultrabug Exp $ EAPI="2" @@ -28,7 +28,9 @@ RDEPEND=" snmp? ( net-analyzer/net-snmp ) !heartbeat? ( !ais? ( sys-cluster/openais ) ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + !=dev-libs/glib-2.32* +" PATCHES=( "${FILESDIR}/${PN}-1.0.10-asneeded.patch" diff --git a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild index e760992d7724..41099bcd708c 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-2012 Gentoo Foundation +# 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.0.12.ebuild,v 1.2 2012/07/11 16:05:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild,v 1.3 2013/04/18 09:53:17 ultrabug Exp $ EAPI="2" @@ -31,7 +31,9 @@ DEPEND=" smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !=dev-libs/glib-2.32* +" PATCHES=( "${FILESDIR}/${PN}-1.0.10-asneeded.patch" |