summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2011-12-28 11:06:55 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2011-12-28 11:06:55 +0000
commitf35a9387d731d5d7331ad2604d1a4d0588af7718 (patch)
treef8822d59de19920a6ebd978a91a621e1011380da /sys-cluster
parentDrop ruby19 from the right revision. (diff)
downloadgentoo-2-f35a9387d731d5d7331ad2604d1a4d0588af7718.tar.gz
gentoo-2-f35a9387d731d5d7331ad2604d1a4d0588af7718.tar.bz2
gentoo-2-f35a9387d731d5d7331ad2604d1a4d0588af7718.zip
Ebuild cleanup, fix #387025, #387027 thanks to ago.
(Portage version: 2.1.10.43/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/heartbeat/ChangeLog6
-rw-r--r--sys-cluster/heartbeat/files/3.0.4-fix_configure.patch11
-rw-r--r--sys-cluster/heartbeat/heartbeat-3.0.5.ebuild4
-rw-r--r--sys-cluster/heartbeat/metadata.xml5
4 files changed, 19 insertions, 7 deletions
diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index 5552f3d3ecf9..9309452d3266 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/heartbeat
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.101 2011/10/18 17:27:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.102 2011/12/28 11:06:55 ultrabug Exp $
+
+ 28 Dec 2011; Ultrabug <ultrabug@gentoo.org> files/3.0.4-fix_configure.patch,
+ heartbeat-3.0.5.ebuild, metadata.xml:
+ Ebuild cleanup, fix #387025, #387027 thanks to ago.
18 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> -heartbeat-1.2.5.ebuild,
-heartbeat-1.2.5-r1.ebuild, -heartbeat-2.0.7-r2.ebuild,
diff --git a/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch b/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
index 03db0ccc7f6d..c747592b7baa 100644
--- a/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
+++ b/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
@@ -97,3 +97,14 @@
dnl *************************************************************************
PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
+--- work/Heartbeat-3-0-STABLE-3.0.5/configure.in 2011-12-28 11:51:05.601673071 +0100
++++ work2/Heartbeat-3-0-STABLE-3.0.5/configure.in 2011-12-28 11:54:34.223094385 +0100
+@@ -2002,7 +2002,7 @@
+ fi
+
+ if test "$GCC" = yes; then
+- CFLAGS="$CFLAGS -ggdb3"
++ CFLAGS="$CFLAGS"
+ if
+ cc_supports_flag -funsigned-char
+ then
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild
index 91c020f4c3c0..f093c0419e04 100644
--- a/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild,v 1.5 2011/10/18 10:31:51 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild,v 1.6 2011/12/28 11:06:55 ultrabug Exp $
EAPI="2"
@@ -78,6 +78,8 @@ src_install() {
# fix collisions
rm -rf "${D}"/usr/include/heartbeat/{compress,ha_msg}.h
+ use static-libs || find "${D}"/usr/$(get_libdir) -name "*.la" -delete
+
if use doc ; then
dodoc README doc/*.txt doc/AUTHORS || die
fi
diff --git a/sys-cluster/heartbeat/metadata.xml b/sys-cluster/heartbeat/metadata.xml
index f07112b87f50..25095c392e31 100644
--- a/sys-cluster/heartbeat/metadata.xml
+++ b/sys-cluster/heartbeat/metadata.xml
@@ -6,9 +6,4 @@
<longdescription>
Heartbeat is a cluster manager to handle failover of 2 nodes.
</longdescription>
- <use>
- <flag name='ldirectord'>Adds support for ldiretord, use enabled because it
- has a lot of deps</flag>
- <flag name='management'>Adds support for management GUI</flag>
- </use>
</pkgmetadata>