sys-cluster/pacemaker: Remove dep on heartbeat

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

4 files changed, 12 insertions, 33 deletions

diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index 4548b53178e8..dcb0f854efe2 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 f6bef07a1217..ef21da20c787 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 c20405e8e1b0..7790d983ce70 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 0c8299ce0378..d1e44f3de6f8 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() {