summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-06-30 10:58:41 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-06-30 10:58:41 +0000
commit9b5aa828d3c679dde90dc48485857dd05f0a52a4 (patch)
tree2b4268f3249a5eeeb7d0fdc8d54bbb6821b730d1 /sys-cluster/heartbeat
parentremove lintar entry (diff)
downloadgentoo-2-9b5aa828d3c679dde90dc48485857dd05f0a52a4.tar.gz
gentoo-2-9b5aa828d3c679dde90dc48485857dd05f0a52a4.tar.bz2
gentoo-2-9b5aa828d3c679dde90dc48485857dd05f0a52a4.zip
Fix install wrt bug 323413. Thanks to Slipeer <Slipeer@mail.ru> for patch.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster/heartbeat')
-rw-r--r--sys-cluster/heartbeat/ChangeLog6
-rw-r--r--sys-cluster/heartbeat/files/heartbeat-2.0.8-install_fix.patch15
-rw-r--r--sys-cluster/heartbeat/heartbeat-2.0.8.ebuild14
3 files changed, 28 insertions, 7 deletions
diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index f5dce8791cf8..de3b9ea1381c 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/heartbeat
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.82 2010/06/21 14:35:33 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.83 2010/06/30 10:58:41 xarthisius Exp $
+
+ 30 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ heartbeat-2.0.8.ebuild, +files/heartbeat-2.0.8-install_fix.patch:
+ Fix install wrt bug 323413. Thanks to Slipeer <Slipeer@mail.ru> for patch.
*heartbeat-3.0.3 (21 Jun 2010)
diff --git a/sys-cluster/heartbeat/files/heartbeat-2.0.8-install_fix.patch b/sys-cluster/heartbeat/files/heartbeat-2.0.8-install_fix.patch
new file mode 100644
index 000000000000..7b34f98e3342
--- /dev/null
+++ b/sys-cluster/heartbeat/files/heartbeat-2.0.8-install_fix.patch
@@ -0,0 +1,15 @@
+Fix install
+
+http://bugs.gentoo.org/show_bug.cgi?id=323413
+
+Patch written by Slipeer <Slipeer@mail.ru>
+--- resources/OCF/Makefile.am
++++ resources/OCF/Makefile.am
+@@ -44,7 +44,6 @@
+ Dummy \
+ IPaddr \
+ IPaddr2 \
+- drbd \
+ apache \
+ AudibleAlarm \
+ db2 \
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
index c0c191794989..091673d64785 100644
--- a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.17 2009/11/18 17:36:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.18 2010/06/30 10:58:41 xarthisius Exp $
inherit autotools flag-o-matic eutils
@@ -48,10 +48,12 @@ src_unpack() {
unpack ${A}
cd "${S}"
#epatch "${FILESDIR}"/${P}-update-resources-failcount.patch
- epatch "${FILESDIR}"/${P}-crm-leaks.patch
- epatch "${FILESDIR}"/${P}-delay.patch
- epatch "${FILESDIR}"/${P}-glibc.patch
- epatch "${FILESDIR}"/${P}-asneeded.patch
+ epatch "${FILESDIR}"/${P}-crm-leaks.patch \
+ "${FILESDIR}"/${P}-delay.patch \
+ "${FILESDIR}"/${P}-glibc.patch \
+ "${FILESDIR}"/${P}-asneeded.patch \
+ "${FILESDIR}"/${P}-install_fix.patch
+
sed -i \
-e 's:libgnutls-config:pkg-config gnutls:g' \
lib/mgmt/Makefile.am \