commit: ad052985e2cf1e4efd363d947b5e504cbf21df72 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Feb 20 09:49:58 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Feb 20 09:51:11 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad052985
sys-cluster/heartbeat: python-single-r1, EAPI=6 sys-cluster/heartbeat/files/3.0.4-docs.patch | 8 ++--- .../heartbeat/files/3.0.4-fix_configure.patch | 8 ++--- .../heartbeat/files/3.0.4-python_tests.patch | 4 +-- ...t-3.0.5-r2.ebuild => heartbeat-3.0.5-r3.ebuild} | 36 +++++++++++----------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sys-cluster/heartbeat/files/3.0.4-docs.patch b/sys-cluster/heartbeat/files/3.0.4-docs.patch index 9297c31cb0..a558dd36f5 100644 --- a/sys-cluster/heartbeat/files/3.0.4-docs.patch +++ b/sys-cluster/heartbeat/files/3.0.4-docs.patch @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -505,8 +505,15 @@ AC_PATH_PROGS(TEST, test) AC_PATH_PROGS(PKGCONFIG, pkg-config) @@ -18,8 +18,8 @@ dnl ************************************************************************ dnl Check whether non-root user can chown. ---- doc/Makefile.am -+++ doc/Makefile.am +--- a/doc/Makefile.am ++++ b/doc/Makefile.am @@ -33,11 +33,12 @@ doc_DATA = $(OTHER_DOCS) 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 c747592b7b..1df22b337c 100644 --- a/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch +++ b/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch @@ -1,5 +1,5 @@ ---- work/Heartbeat-3-0-STABLE-3.0.4/configure.in 2010-12-09 21:09:47.000000000 +0100 -+++ work2/Heartbeat-3-0-STABLE-3.0.4/configure.in 2010-12-28 17:37:45.080773140 +0100 +--- Heartbeat-3-0-STABLE-3.0.4/configure.in 2010-12-09 21:09:47.000000000 +0100 ++++ Heartbeat-3-0-STABLE-3.0.4/configure.in 2010-12-28 17:37:45.080773140 +0100 @@ -243,9 +243,9 @@ mandir=`var "$mandir" "$exec_prefix/man"` dnl docdir is available in autoconf 2.60+, for older versions preseed @@ -97,8 +97,8 @@ 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 +--- Heartbeat-3-0-STABLE-3.0.5/configure.in 2011-12-28 11:51:05.601673071 +0100 ++++ Heartbeat-3-0-STABLE-3.0.5/configure.in 2011-12-28 11:54:34.223094385 +0100 @@ -2002,7 +2002,7 @@ fi diff --git a/sys-cluster/heartbeat/files/3.0.4-python_tests.patch b/sys-cluster/heartbeat/files/3.0.4-python_tests.patch index a91c7ec3fe..e6e1071573 100644 --- a/sys-cluster/heartbeat/files/3.0.4-python_tests.patch +++ b/sys-cluster/heartbeat/files/3.0.4-python_tests.patch @@ -1,5 +1,5 @@ ---- cts/Makefile.am -+++ cts/Makefile.am +--- a/cts/Makefile.am ++++ b/cts/Makefile.am @@ -21,7 +21,7 @@ ctsdir = @HA_NOARCHDATAHBDIR@/cts diff --git a/sys-cluster/heartbeat/heartbeat-3.0.5-r2.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild similarity index 68% rename from sys-cluster/heartbeat/heartbeat-3.0.5-r2.ebuild rename to sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild index 21537846a1..e6b5a83467 100644 --- a/sys-cluster/heartbeat/heartbeat-3.0.5-r2.ebuild +++ b/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="2" +EAPI="6" -PYTHON_DEPEND="2" -inherit python autotools multilib eutils base +PYTHON_COMPAT=( python2_7 ) +inherit autotools python-single-r1 DESCRIPTION="Heartbeat high availability cluster manager" HOMEPAGE="http://www.linux-ha.org/wiki/Heartbeat"; @@ -21,6 +21,7 @@ RDEPEND="sys-cluster/cluster-glue virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) + ${PYTHON_DEPS} " DEPEND="${RDEPEND} virtual/pkgconfig @@ -29,6 +30,8 @@ DEPEND="${RDEPEND} PDEPEND="sys-cluster/resource-agents" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + S=${WORKDIR}/Heartbeat-3-0-STABLE-${PV} PATCHES=( @@ -39,49 +42,46 @@ PATCHES=( ) pkg_setup() { - python_set_active_version 2 - python_pkg_setup + python-single-r1_pkg_setup ewarn "If you're upgrading from heartbeat-2.x please follow:" ewarn "https://www.gentoo.org/proj/en/cluster/ha-cluster/heartbeat-upgrade.xml"; } src_prepare() { - base_src_prepare + default eautoreconf - cp "${FILESDIR}"/heartbeat-init "${T}" || die + cp "${FILESDIR}"/heartbeat-init "${WORKDIR}" || die sed -i \ -e "/ResourceManager/ s/lib/share/" \ -e "s:lib:$(get_libdir):g" \ - "${T}"/heartbeat-init || die + "${WORKDIR}"/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 + default - newinitd "${T}/heartbeat-init" heartbeat || die + newinitd "${WORKDIR}/heartbeat-init" heartbeat # fix collisions - rm -rf "${D}"/usr/include/heartbeat/{compress,ha_msg}.h + rm -rf "${D}"/usr/include/heartbeat/{compress,ha_msg}.h || die - use static-libs || find "${D}"/usr/$(get_libdir) -name "*.la" -delete + if ! use static-libs; then + find "${D}" -name "*.la" -delete || die + fi if use doc ; then - dodoc README doc/*.txt doc/AUTHORS || die + dodoc README doc/*.txt doc/AUTHORS || die fi }
