From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69673138335 for ; Tue, 11 Dec 2018 15:33:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71ECCE0BE8; Tue, 11 Dec 2018 15:33:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39F79E0BE8 for ; Tue, 11 Dec 2018 15:33:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12012335CC0 for ; Tue, 11 Dec 2018 15:33:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F34E4E6 for ; Tue, 11 Dec 2018 15:33:35 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1544542408.e473547029f5b8fd9b0c1faa6dc33ea29d0e2024.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/, profiles/base/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/base/package.use.mask sys-cluster/pacemaker/metadata.xml sys-cluster/pacemaker/pacemaker-1.1.16.ebuild sys-cluster/pacemaker/pacemaker-1.1.19.ebuild X-VCS-Directories: sys-cluster/pacemaker/ profiles/base/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e473547029f5b8fd9b0c1faa6dc33ea29d0e2024 X-VCS-Branch: master Date: Tue, 11 Dec 2018 15:33:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 634b3dfe-7eae-4427-aeb1-1b37f8f0dd72 X-Archives-Hash: 9aa89ec3f72e9b484840bc850dedea0e commit: e473547029f5b8fd9b0c1faa6dc33ea29d0e2024 Author: Michał Górny gentoo org> AuthorDate: Tue Dec 11 15:04:43 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Dec 11 15:33:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4735470 sys-cluster/pacemaker: [QA] Punt removed cman dep Signed-off-by: Michał Górny gentoo.org> 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 468c52ff905..5ec2c69b9cc 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 fd2bc1c6902..4548b53178e 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 a1744825da2..019e2630039 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 d53ebabf723..610fa658e5f 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) \