From 4eef78f0495408fc22e9d9b5d2897c7e91908e4f Mon Sep 17 00:00:00 2001 From: Alexys Jacob Date: Mon, 24 Oct 2011 11:25:48 +0000 Subject: [PATCH] EAPI4, add cman compatibility via IUSE, move to GitHub for sources. Package-Manager: portage-2.1.10.29/cvs/Linux x86_64 --- sys-cluster/pacemaker/ChangeLog | 12 ++- sys-cluster/pacemaker/Manifest | 22 ++--- sys-cluster/pacemaker/metadata.xml | 1 + .../pacemaker/pacemaker-1.1.6.1.ebuild | 86 +++++++++++++++++++ 4 files changed, 105 insertions(+), 16 deletions(-) create mode 100644 sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog index 216deeccb111..f9be19336bbc 100644 --- a/sys-cluster/pacemaker/ChangeLog +++ b/sys-cluster/pacemaker/ChangeLog @@ -1,12 +1,22 @@ # ChangeLog for sys-cluster/pacemaker # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.16 2011/10/18 18:40:04 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.17 2011/10/24 11:25:48 ultrabug Exp $ + + 24 Oct 2011; Ultrabug +pacemaker-1.1.6.1.ebuild, + metadata.xml: + EAPI4, add cman compatibility via IUSE, move to GitHub for sources. 18 Oct 2011; Kacper Kowalik pacemaker-1.1.4-r4.ebuild, pacemaker-1.1.5.ebuild: Depend either on corosync or on heartbeat stack wrt bug #387581 by Jeroen Roovers +*pacemaker-1.1.6.1 (12 Oct 2011) + + 12 Oct 2011; Ultrabug +pacemaker-1.1.6.1.ebuild, + metadata.xml: + Version bump, add cman to IUSE. + 21 Sep 2011; Ultrabug pacemaker-1.1.5.ebuild: Fix missing dep #382957, thanks to Guillaume Chanaud. diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest index 3e2261449cea..ec3d917df718 100644 --- a/sys-cluster/pacemaker/Manifest +++ b/sys-cluster/pacemaker/Manifest @@ -11,26 +11,18 @@ DIST Pacemaker-1.0.10.tar.bz2 6642704 RMD160 9eaac150c7e3e7f2e1c00303025aa8fe5bf DIST Pacemaker-1.0.11.tar.bz2 6706773 RMD160 6ab3dbccf537a2b635a87b0089307b5309705df4 SHA1 7b3bb3401d9a9183130766625a0e8eb587f89b55 SHA256 568a8a7257ca9eb2d546c74fb18ee27d1e4e8eb58d9e2be0325cda1569b0ae75 DIST Pacemaker-1.1.4.tar.bz2 23444765 RMD160 ca2635622e2a63258d7dc9933541eb2e3b728679 SHA1 382a4cbd80ef8f1c303f1c5c02d60390e808397f SHA256 922e2929cf9f2efa2e2d9b3185a7ac826a96e86cd8d9f4c4eae177f88f1f03b1 DIST Pacemaker-1.1.5.tar.bz2 23531621 RMD160 56761cb9bb9aa22d0275fedc851269a5f472d29e SHA1 da8c6f09e549879961231028582fdbe69c9ac8c6 SHA256 aa1dcf2dc6deff3676fa7d0938f80bb4f163011d491d0478798e971ca2d58fb2 +DIST pacemaker-1.1.6.1.tar.gz 8722056 RMD160 e85dcdb57ae6afd3e351052cabd7938e15b39034 SHA1 d4d95ac06ea742965696552ba41bc2a49a643b25 SHA256 57b962cce13ae2a11e2439fb6c88722233baac329b5a634a42e410f0ce8db059 EBUILD pacemaker-1.0.10.ebuild 1704 RMD160 6f11269269bf3ec33d8f9ac0ea91c3f43d273644 SHA1 8ea2440ed206ecf371ee5d2937d0589776a8008e SHA256 fc5b74f7ee393bf6875591f9a7f34b9d2fe49ba52b79d58e2ed6478bc838d28b EBUILD pacemaker-1.0.11.ebuild 1695 RMD160 d5fa6f353a4e7b08b3c2448068cd54b8e5aa6109 SHA1 93dfb0e07e33fdc3411121970112ca4d2b6041b3 SHA256 241df375f211ae31e5c77d17caf9b70798d90b121d47ecc31c2869a88781fab6 EBUILD pacemaker-1.1.4-r4.ebuild 2173 RMD160 b3680ec384fa9ab27a84a614e3a54c4a6264d118 SHA1 45b6705b10cfd8f45601b30fbe84bf579d83d894 SHA256 7c8aa067a3bdbffdf29ad4e9213b37b5281c4d0308884d766c11da60dc47336b EBUILD pacemaker-1.1.5.ebuild 2174 RMD160 adfe3d30358c264bea2f53b7a061ba728c658ba6 SHA1 880295f039ca62aa0b7c0363a61552effb437807 SHA256 861f2c812dbcda44077669593d0b72681b93a30b798f921098dd063fde854c10 -MISC ChangeLog 3046 RMD160 5c6fc35e0386deb19c45cc4975c66ba2dd821360 SHA1 b4525c5fc6c72d051064749db2e2fd0a02a174e7 SHA256 564727694bbd46459c61a92e6b0d4bc0000f8a53239ca19d4faa833fcb757784 -MISC metadata.xml 797 RMD160 c99dc189163047b32ad1915b13e33cc01a407481 SHA1 c9a83889da12df16797e7436751e184440ef9537 SHA256 904067d2d16de829ccfc138dde85ea965db6d680b4cea293105542a5a8b9ca52 +EBUILD pacemaker-1.1.6.1.ebuild 2247 RMD160 af4be890aeebb4a6f74b36d35ee94a2efad99045 SHA1 cda0674c0a60722074bd3059d67af6ed1cfd7081 SHA256 6cf5f0062d235d80129c0715cf9ffaa972b1859af4694985ee732598b230d2e1 +MISC ChangeLog 3362 RMD160 7c25456f5af48101c75f278601a1bb7e5d9aa0f2 SHA1 725cdf4ab782ac6ddb0da67fcc03cc5a08ccb98c SHA256 f7743a3e2adeb8cc730ffa62c9eec26b2a0a5f54466a6cdfb09b5616aa73b89b +MISC metadata.xml 870 RMD160 eaebf5c9ba00ab06edbdd3d10fca4a5d85df3924 SHA1 824ec601ce5d08e2aa07471d4dab1307248ff06e SHA256 ca8b9f3af29de78a1e6196cd392c6c85635f8f7fb2303befc762bd135439fd3b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCAAGBQJOncgQAAoJEF0huFKJUZL5+nwP/Ryw8F/qRFlJ37M2rb67LxAp -4ki4xM1XmlYdaZ7hHvlgTGjp22mP6+GqpDfVh9KpHLCjAFvmqQmVkKl2pakOVuA+ -m6kTK56CIN4ofFhAI6kzIFXk3g762pFhP8bMZyAqZHGpv2OOSJ59BbZ1C1vC4xtX -vG+6vtmsPOWi86wTNK680XKmohqQZ4HbrAvK1psIWTfHyz0nucD45cAyJTCO6QNX -MQ1qoee7lMAlMGZq2XVE3E7FCZIfoXnglQvXJ8yr3UiNMb+ZbeTvl+O1Q+zWYvIV -Rq3WkkPokSR73plC+rxhOPCfUsdEPihVn7Cghgdle3/Gw6HDLCaVFoPb8BrHaSYr -wYm5ZZrZ1d1IuNIaxMR9mgOnXq7N0lNYZxsA32/i1wxE8zwqbU2QJo1gONyY+864 -4c6SQVJbFMsQXklb+dBD5naZTwbyhApV4Dfsl3d/L4Jj72pXejL9s4gqRSYHj2C7 -UMnL3ReivSwup8ovXzn2DhRYN0zSetgTdTiqSCmYVpPLSPr3/0PNf0Qkyn0Kne+T -Xy1oOfWfvxfzuPLEcl9m1qy6mGKwoGB7DQ9PBvPcXRygTDQIl3fjZJYxlWeeGnVx -Wtmx7KDWcPexPFs0FEArkgYyC4JwDLP/rvdL4wyIWfBBLM7mNAnCuh0dCgqDFfp5 -/V2z+FTKuSBAmoi+u7o5 -=miSY +iF4EAREIAAYFAk6lS0UACgkQKiQSS7ZY+hPuRAD/XHSmHoN4fBxLjfa7rzDX0ASW +Q1ySWRVx4fKBNliHhsEBAOi46y+YkaTzs4Ph+6HLzV35NYO3Fxu26hizresHLqEc +=0HLP -----END PGP SIGNATURE----- diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml index 08b424331f5c..e36a21bf761c 100644 --- a/sys-cluster/pacemaker/metadata.xml +++ b/sys-cluster/pacemaker/metadata.xml @@ -9,6 +9,7 @@ Enable sys-cluster/openais support. + Enable sys-cluster/cman support. Enable sys-cluster/heartbeat support. Enable SMTP support via net-libs/libsmtp diff --git a/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild new file mode 100644 index 000000000000..f89b6ad0b471 --- /dev/null +++ b/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild,v 1.1 2011/10/24 11:25:48 ultrabug Exp $ + +EAPI=4 + +inherit autotools base python + +MY_PN=Pacemaker +MY_P=${MY_PN}-${PV} +MY_TREE="0c7312c" +PYTHON_DEPEND="2" + +DESCRIPTION="Pacemaker CRM" +HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker" +SRC_URI="https://github.com/ClusterLabs/${PN}/tarball/${MY_P} -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" +REQUIRED_USE="cman? ( !heartbeat )" +IUSE="acl cman heartbeat smtp snmp static-libs" + +DEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + sys-cluster/cluster-glue + sys-cluster/resource-agents + cman? ( sys-cluster/cman ) + heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) + !heartbeat? ( sys-cluster/corosync ) + smtp? ( net-libs/libesmtp ) + snmp? ( net-analyzer/net-snmp ) +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/ClusterLabs-${PN}-${MY_TREE}" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + base_src_prepare + sed -i -e "/ggdb3/d" configure.ac || die + eautoreconf +} + +src_configure() { + local myopts="" + use heartbeat || myopts="--with-ais" + # appends lib to localstatedir automatically + econf \ + --localstatedir=/var \ + --disable-dependency-tracking \ + --disable-fatal-warnings \ + $(use_with acl) \ + $(use_with cman cs-quorum) \ + $(use_with cman cman) \ + $(use_with heartbeat) \ + $(use_with smtp esmtp) \ + $(use_with snmp) \ + $(use_enable static-libs static) \ + ${myopts} +} + +src_install() { + base_src_install + newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + insinto /etc/corosync/service.d + newins "${FILESDIR}/${PN}.service" ${PN} || die +} + +pkg_postinst() { + elog "This version of Pacemaker uses the new MCP feature" + elog "and the v1 plugin for CoroSync. Read [1] for more info." + elog + elog "To start the Pacemaker Cluster Manager, run:" + elog "/etc/init.d/pacemaker start" + elog + elog "[1] http://theclusterguy.clusterlabs.org/post/907043024/introducing-the-pacemaker-master-control-process-for" + elog + elog "Note: sys-cluster/openais is no longer a hard dependency of ${P}," + elog "so you may need to install it yourself to suit your needs." +} -- 2.26.2