ultrabug    14/06/16 09:56:00

  Modified:             ChangeLog
  Added:                heartbeat-3.0.5-r2.ebuild
  Removed:              heartbeat-3.0.5-r1.ebuild
  Log:
  fix #486186
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
B658FA13)

Revision  Changes    Path
1.105                sys-cluster/heartbeat/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/ChangeLog?rev=1.105&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/ChangeLog?rev=1.105&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/ChangeLog?r1=1.104&r2=1.105

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ChangeLog   29 Oct 2012 16:44:23 -0000      1.104
+++ ChangeLog   16 Jun 2014 09:55:59 -0000      1.105
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/heartbeat
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.104 
2012/10/29 16:44:23 ultrabug Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.105 
2014/06/16 09:55:59 ultrabug Exp $
+
+*heartbeat-3.0.5-r2 (16 Jun 2014)
+
+  16 Jun 2014; Ultrabug <[email protected]> -heartbeat-3.0.5-r1.ebuild,
+  +heartbeat-3.0.5-r2.ebuild, +files/3.0.5-fix_ucast.patch:
+  fix #486186 thx to Zdravko Spoljar and Timothy Jones, drop broken
 
 *heartbeat-3.0.5-r1 (29 Oct 2012)
 



1.1                  sys-cluster/heartbeat/heartbeat-3.0.5-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.5-r2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.5-r2.ebuild?rev=1.1&content-type=text/plain

Index: heartbeat-3.0.5-r2.ebuild
===================================================================
# Copyright 1999-2014 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-r2.ebuild,v 1.1 
2014/06/16 09:55:59 ultrabug Exp $

EAPI="2"

PYTHON_DEPEND="2"
inherit python autotools multilib eutils base

DESCRIPTION="Heartbeat high availability cluster manager"
HOMEPAGE="http://www.linux-ha.org/wiki/Heartbeat";
SRC_URI="http://hg.linux-ha.org/${PN}-STABLE_3_0/archive/STABLE-${PV}.tar.bz2";

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
IUSE="doc snmp static-libs"

RDEPEND="sys-cluster/cluster-glue
        dev-libs/glib:2
        virtual/ssh
        net-libs/gnutls
        snmp? ( net-analyzer/net-snmp )
"
DEPEND="${RDEPEND}
        virtual/pkgconfig
        dev-lang/swig
        doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets )"

PDEPEND="sys-cluster/resource-agents"

S=${WORKDIR}/Heartbeat-3-0-STABLE-${PV}

PATCHES=(
        "${FILESDIR}/3.0.4-fix_configure.patch"
        "${FILESDIR}/3.0.4-docs.patch"
        "${FILESDIR}/3.0.4-python_tests.patch"
        "${FILESDIR}/3.0.5-fix_ucast.patch"
)

pkg_setup() {
        python_set_active_version 2
        python_pkg_setup

        ewarn "If you're upgrading from heartbeat-2.x please follow:"
        ewarn 
"http://www.gentoo.org/proj/en/cluster/ha-cluster/heartbeat-upgrade.xml";
}

src_prepare() {
        base_src_prepare
        eautoreconf

        cp "${FILESDIR}"/heartbeat-init "${T}" || die
        sed -i \
                -e "/ResourceManager/ s/lib/share/" \
                -e "s:lib:$(get_libdir):g" \
                "${T}"/heartbeat-init || die
}

src_configure() {
        econf \
                --disable-dependency-tracking \
                --disable-fatal-warnings \
                $(use_enable static-libs static) \
                $(use_enable doc) \
                --disable-tipc \
                --enable-dopd \
                --libdir=/usr/$(get_libdir) \
                --localstatedir=/var \
                --docdir=/usr/share/doc/${PF} \
                $(use_enable snmp)
}

src_install() {
        base_src_install

        newinitd "${T}/heartbeat-init" heartbeat || die

        # 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
}




Reply via email to