From e473547029f5b8fd9b0c1faa6dc33ea29d0e2024 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 11 Dec 2018 16:04:43 +0100 Subject: [PATCH] sys-cluster/pacemaker: [QA] Punt removed cman dep MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- profiles/base/package.use.mask | 4 ---- sys-cluster/pacemaker/metadata.xml | 1 - sys-cluster/pacemaker/pacemaker-1.1.16.ebuild | 8 +++----- sys-cluster/pacemaker/pacemaker-1.1.19.ebuild | 8 +++----- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 468c52ff9054..5ec2c69b9cc5 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -48,10 +48,6 @@ sci-libs/ceres-solver sparse # upower-pm-utils will be removed (#596988) mate-extra/mate-power-manager pm-utils -# Pacho Ramos (04 Nov 2018) -# cman and co. are going to be removed (#650738) -sys-cluster/pacemaker cman - # Pacho Ramos (01 Nov 2018) # cman and co. are going to be removed (#650738) sys-fs/lvm2 cman clvm diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml index fd2bc1c69029..4548b53178e8 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). - Enable cman support. Enable sys-cluster/heartbeat support. Enable SMTP support via net-libs/libesmtp diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild index a1744825da24..019e26300394 100644 --- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild +++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild @@ -16,8 +16,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 hppa x86" -REQUIRED_USE="cman? ( !heartbeat )" -IUSE="acl cman heartbeat smtp snmp static-libs" +IUSE="acl heartbeat smtp snmp static-libs" DEPEND="${PYTHON_DEPS} app-text/docbook-xsl-stylesheets @@ -25,7 +24,6 @@ DEPEND="${PYTHON_DEPS} sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents - cman? ( sys-cluster/cman ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) @@ -58,8 +56,8 @@ src_configure() { --disable-dependency-tracking \ --disable-fatal-warnings \ $(use_with acl) \ - $(use_with cman cs-quorum) \ - $(use_with cman cman) \ + --without-cs-quorum \ + --without-cman \ $(use_with heartbeat) \ $(use_with smtp esmtp) \ $(use_with snmp) \ diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild index d53ebabf7236..610fa658e5fc 100644 --- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild +++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild @@ -16,8 +16,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~hppa ~x86" -REQUIRED_USE="cman? ( !heartbeat )" -IUSE="acl cman heartbeat smtp snmp static-libs" +IUSE="acl heartbeat smtp snmp static-libs" DEPEND="${PYTHON_DEPS} app-text/docbook-xsl-stylesheets @@ -25,7 +24,6 @@ DEPEND="${PYTHON_DEPS} sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents - cman? ( sys-cluster/cman ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) @@ -58,8 +56,8 @@ src_configure() { --disable-dependency-tracking \ --disable-fatal-warnings \ $(use_with acl) \ - $(use_with cman cs-quorum) \ - $(use_with cman cman) \ + --without-cs-quorum \ + --without-cman \ $(use_with heartbeat) \ $(use_with smtp esmtp) \ $(use_with snmp) \ -- 2.26.2