From 8a3828cb8a49663342c801a9e5c1dc24bfb220f9 Mon Sep 17 00:00:00 2001 From: Christian Zoffoli Date: Sat, 12 May 2007 13:18:52 +0000 Subject: Stable on x86. (Portage version: 2.1.2.2) --- sys-cluster/cman/ChangeLog | 7 ++++++- sys-cluster/cman/cman-1.03.00.ebuild | 7 ++++--- sys-cluster/cman/cman-1.04.00.ebuild | 3 ++- sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch | 11 +++++++++++ 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch (limited to 'sys-cluster/cman') diff --git a/sys-cluster/cman/ChangeLog b/sys-cluster/cman/ChangeLog index ede00986c914..6606464197cf 100644 --- a/sys-cluster/cman/ChangeLog +++ b/sys-cluster/cman/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/cman # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.33 2007/04/26 06:26:48 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.34 2007/05/12 13:18:52 xmerlin Exp $ + + 12 May 2007; Christian Zoffoli + +files/cman-1.03.00-qdisk-makefile.patch, cman-1.03.00.ebuild, + cman-1.04.00.ebuild: + Stable on x86. 26 Apr 2007; Donnie Berkholz ; metadata.xml: Update for cluster herd split to hp-cluster and ha-cluster. diff --git a/sys-cluster/cman/cman-1.03.00.ebuild b/sys-cluster/cman/cman-1.03.00.ebuild index a71c7c950e5e..2eb209b2b045 100644 --- a/sys-cluster/cman/cman-1.03.00.ebuild +++ b/sys-cluster/cman/cman-1.03.00.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.03.00.ebuild,v 1.4 2007/03/09 16:26:14 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.03.00.ebuild,v 1.5 2007/05/12 13:18:52 xmerlin Exp $ inherit eutils @@ -13,7 +13,7 @@ SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 x86" IUSE="" DEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}* @@ -26,7 +26,8 @@ S="${WORKDIR}/${MY_P}/${PN}" src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/cman-1.03.00-compile-hack.patch || die + epatch ${FILESDIR}/${PN}-1.03.00-compile-hack.patch || die + epatch ${FILESDIR}/${PN}-1.03.00-qdisk-makefile.patch || die } diff --git a/sys-cluster/cman/cman-1.04.00.ebuild b/sys-cluster/cman/cman-1.04.00.ebuild index 36397542964e..27db3ee34811 100644 --- a/sys-cluster/cman/cman-1.04.00.ebuild +++ b/sys-cluster/cman/cman-1.04.00.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.04.00.ebuild,v 1.2 2007/03/09 16:26:14 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.04.00.ebuild,v 1.3 2007/05/12 13:18:52 xmerlin Exp $ inherit eutils @@ -27,6 +27,7 @@ src_unpack() { unpack ${A} cd ${S} epatch ${FILESDIR}/cman-1.03.00-compile-hack.patch || die + epatch ${FILESDIR}/${PN}-1.03.00-qdisk-makefile.patch || die } diff --git a/sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch b/sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch new file mode 100644 index 000000000000..e62dd03bf294 --- /dev/null +++ b/sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch @@ -0,0 +1,11 @@ +--- cluster-1.03.00/cman/qdisk/Makefile.orig 2006-07-21 20:01:38.000000000 +0200 ++++ cluster-1.03.00/cman/qdisk/Makefile 2007-03-13 13:42:14.000000000 +0100 +@@ -32,7 +32,7 @@ + + qdiskd: disk.o crc32.o disk_util.o main.o score.o bitmap.o clulog.o \ + gettid.o proc.o ../lib/libcman.a +- gcc -o $@ $^ -lpthread -L../lib -lccs ++ gcc -o $@ $^ -L$(libdir) -lpthread -L../lib -lccs + + mkqdisk: disk.o crc32.o disk_util.o \ + proc.o mkqdisk.o -- cgit v1.2.3-65-gdbad