[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/
Date: Fri,  9 Oct 2020 08:20:57 +0000 (UTC)	[thread overview]
Message-ID: <1602231654.234096c2d922648ed9345903a010d9c977937525.mgorny@gentoo> (raw)

commit:     234096c2d922648ed9345903a010d9c977937525
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  9 08:20:08 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct  9 08:20:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234096c2

sys-cluster/pacemaker: Remove dep on heartbeat

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-cluster/pacemaker/metadata.xml               |  1 -
 sys-cluster/pacemaker/pacemaker-1.1.16.ebuild    | 15 ++++-----------
 sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild | 14 ++++----------
 sys-cluster/pacemaker/pacemaker-1.1.19.ebuild    | 15 ++++-----------
 4 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index 4548b53178e..dcb0f854efe 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -12,7 +12,6 @@
 		capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
 	</longdescription>
 	<use>
-		<flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
 		<flag name="smtp">Enable SMTP support via <pkg>net-libs/libesmtp</pkg></flag>
 	</use>
 	<upstream>

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index f6bef07a121..ef21da20c78 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -16,16 +16,15 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa x86"
-IUSE="acl heartbeat smtp snmp static-libs"
+IUSE="acl smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	sys-cluster/cluster-glue
+	sys-cluster/corosync
 	>=sys-cluster/libqb-0.14.0
 	sys-cluster/resource-agents
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
 	smtp? ( net-libs/libesmtp )
 	snmp? ( net-analyzer/net-snmp )
 "
@@ -43,12 +42,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
 	# appends lib to localstatedir automatically
 	econf \
 		--localstatedir=/var \
@@ -56,11 +49,11 @@ src_configure() {
 		$(use_with acl) \
 		--without-cs-quorum \
 		--without-cman \
-		$(use_with heartbeat) \
+		--without-heartbeat \
 		$(use_with smtp esmtp) \
 		$(use_with snmp) \
 		$(use_enable static-libs static) \
-		${myopts}
+		--with-ais
 }
 
 src_install() {

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
index c20405e8e1b..7790d983ce7 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
@@ -16,17 +16,16 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl heartbeat smtp snmp"
+IUSE="acl smtp snmp"
 
 DEPEND="${PYTHON_DEPS}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	sys-cluster/cluster-glue
+	sys-cluster/corosync
 	>=sys-cluster/libqb-0.14.0
 	sys-cluster/resource-agents
 
-	heartbeat?	( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat?	( sys-cluster/corosync )
 	smtp?		( net-libs/libesmtp )
 	snmp?		( net-analyzer/net-snmp )
 "
@@ -52,17 +51,12 @@ src_configure() {
 		--without-cs-quorum
 		--without-cman
 		$(use_with acl)
-		$(use_with heartbeat)
+		--without-heartbeat
 		$(use_with smtp esmtp)
 		$(use_with snmp)
+		--with-ais
 	)
 
-	if use heartbeat ; then
-		myconf+=( --without-corosync )
-	else
-		myconf+=( --with-ais )
-	fi
-
 	econf "${myconf[@]}"
 }
 

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
index 0c8299ce037..d1e44f3de6f 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
@@ -16,16 +16,15 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl heartbeat smtp snmp static-libs"
+IUSE="acl smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	sys-cluster/cluster-glue
+	sys-cluster/corosync
 	>=sys-cluster/libqb-0.14.0
 	sys-cluster/resource-agents
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
 	smtp? ( net-libs/libesmtp )
 	snmp? ( net-analyzer/net-snmp )
 "
@@ -43,12 +42,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
 	# appends lib to localstatedir automatically
 	econf \
 		--localstatedir=/var \
@@ -56,11 +49,11 @@ src_configure() {
 		$(use_with acl) \
 		--without-cs-quorum \
 		--without-cman \
-		$(use_with heartbeat) \
+		--without-heartbeat \
 		$(use_with smtp esmtp) \
 		$(use_with snmp) \
 		$(use_enable static-libs static) \
-		${myopts}
+		--with-ais
 }
 
 src_install() {

next             reply	other threads:[~2020-10-09  8:21 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-09  8:20 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-06-07  5:22 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/ Sam James
2022-06-07  5:21 Sam James
2022-06-07  2:45 Sam James
2022-01-01 13:38 Ulrich Müller
2022-01-01 10:48 Ulrich Müller
2021-02-08  9:18 Alexys Jacob
2021-02-03 20:19 Thomas Deutschmann
2021-01-08  8:23 Alexys Jacob
2021-01-01 23:29 Sam James
2021-01-01  5:46 Sam James
2020-12-04  1:03 Marc Schiffbauer
2020-12-04  0:55 Marc Schiffbauer
2020-12-04  0:55 Marc Schiffbauer
2020-11-17 18:59 Marc Schiffbauer
2020-11-17 18:54 Marc Schiffbauer
2020-11-10 23:22 Marc Schiffbauer
2020-09-27 10:05 Sergei Trofimovich
2020-05-07 17:58 Michał Górny
2019-11-15 21:52 Alexys Jacob
2018-12-04 14:22 Michał Górny
2018-08-14 22:02 Alexys Jacob
2017-10-14 20:26 Sergei Trofimovich
2017-06-20  5:17 Agostino Sarubbo
2017-06-18 14:01 Agostino Sarubbo
2017-04-25  9:28 Alexys Jacob
2016-04-19 20:07 Ian Stakenvicius
2016-01-26  8:40 Alexys Jacob

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:4548b53178 dfblob:dcb0f854ef dfblob:f6bef07a12
dfblob:ef21da20c7 dfblob:c20405e8e1 dfblob:7790d983ce dfblob:0c8299ce03
dfblob:d1e44f3de6 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1602231654.234096c2d922648ed9345903a010d9c977937525.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox