| 1 |
commit: e473547029f5b8fd9b0c1faa6dc33ea29d0e2024 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 11 15:04:43 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 11 15:33:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4735470 |
| 7 |
|
| 8 |
sys-cluster/pacemaker: [QA] Punt removed cman dep |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
profiles/base/package.use.mask | 4 ---- |
| 13 |
sys-cluster/pacemaker/metadata.xml | 1 - |
| 14 |
sys-cluster/pacemaker/pacemaker-1.1.16.ebuild | 8 +++----- |
| 15 |
sys-cluster/pacemaker/pacemaker-1.1.19.ebuild | 8 +++----- |
| 16 |
4 files changed, 6 insertions(+), 15 deletions(-) |
| 17 |
|
| 18 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 19 |
index 468c52ff905..5ec2c69b9cc 100644 |
| 20 |
--- a/profiles/base/package.use.mask |
| 21 |
+++ b/profiles/base/package.use.mask |
| 22 |
@@ -48,10 +48,6 @@ sci-libs/ceres-solver sparse |
| 23 |
# upower-pm-utils will be removed (#596988) |
| 24 |
mate-extra/mate-power-manager pm-utils |
| 25 |
|
| 26 |
-# Pacho Ramos <pacho@×××××.org> (04 Nov 2018) |
| 27 |
-# cman and co. are going to be removed (#650738) |
| 28 |
-sys-cluster/pacemaker cman |
| 29 |
- |
| 30 |
# Pacho Ramos <pacho@×××××.org> (01 Nov 2018) |
| 31 |
# cman and co. are going to be removed (#650738) |
| 32 |
sys-fs/lvm2 cman clvm |
| 33 |
|
| 34 |
diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml |
| 35 |
index fd2bc1c6902..4548b53178e 100644 |
| 36 |
--- a/sys-cluster/pacemaker/metadata.xml |
| 37 |
+++ b/sys-cluster/pacemaker/metadata.xml |
| 38 |
@@ -12,7 +12,6 @@ |
| 39 |
capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat). |
| 40 |
</longdescription> |
| 41 |
<use> |
| 42 |
- <flag name="cman">Enable cman support.</flag> |
| 43 |
<flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag> |
| 44 |
<flag name="smtp">Enable SMTP support via <pkg>net-libs/libesmtp</pkg></flag> |
| 45 |
</use> |
| 46 |
|
| 47 |
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild |
| 48 |
index a1744825da2..019e2630039 100644 |
| 49 |
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild |
| 50 |
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild |
| 51 |
@@ -16,8 +16,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz" |
| 52 |
LICENSE="GPL-2" |
| 53 |
SLOT="0" |
| 54 |
KEYWORDS="amd64 hppa x86" |
| 55 |
-REQUIRED_USE="cman? ( !heartbeat )" |
| 56 |
-IUSE="acl cman heartbeat smtp snmp static-libs" |
| 57 |
+IUSE="acl heartbeat smtp snmp static-libs" |
| 58 |
|
| 59 |
DEPEND="${PYTHON_DEPS} |
| 60 |
app-text/docbook-xsl-stylesheets |
| 61 |
@@ -25,7 +24,6 @@ DEPEND="${PYTHON_DEPS} |
| 62 |
sys-cluster/cluster-glue |
| 63 |
>=sys-cluster/libqb-0.14.0 |
| 64 |
sys-cluster/resource-agents |
| 65 |
- cman? ( sys-cluster/cman ) |
| 66 |
heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) |
| 67 |
!heartbeat? ( sys-cluster/corosync ) |
| 68 |
smtp? ( net-libs/libesmtp ) |
| 69 |
@@ -58,8 +56,8 @@ src_configure() { |
| 70 |
--disable-dependency-tracking \ |
| 71 |
--disable-fatal-warnings \ |
| 72 |
$(use_with acl) \ |
| 73 |
- $(use_with cman cs-quorum) \ |
| 74 |
- $(use_with cman cman) \ |
| 75 |
+ --without-cs-quorum \ |
| 76 |
+ --without-cman \ |
| 77 |
$(use_with heartbeat) \ |
| 78 |
$(use_with smtp esmtp) \ |
| 79 |
$(use_with snmp) \ |
| 80 |
|
| 81 |
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild |
| 82 |
index d53ebabf723..610fa658e5f 100644 |
| 83 |
--- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild |
| 84 |
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild |
| 85 |
@@ -16,8 +16,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz" |
| 86 |
LICENSE="GPL-2" |
| 87 |
SLOT="0" |
| 88 |
KEYWORDS="~amd64 ~hppa ~x86" |
| 89 |
-REQUIRED_USE="cman? ( !heartbeat )" |
| 90 |
-IUSE="acl cman heartbeat smtp snmp static-libs" |
| 91 |
+IUSE="acl heartbeat smtp snmp static-libs" |
| 92 |
|
| 93 |
DEPEND="${PYTHON_DEPS} |
| 94 |
app-text/docbook-xsl-stylesheets |
| 95 |
@@ -25,7 +24,6 @@ DEPEND="${PYTHON_DEPS} |
| 96 |
sys-cluster/cluster-glue |
| 97 |
>=sys-cluster/libqb-0.14.0 |
| 98 |
sys-cluster/resource-agents |
| 99 |
- cman? ( sys-cluster/cman ) |
| 100 |
heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) |
| 101 |
!heartbeat? ( sys-cluster/corosync ) |
| 102 |
smtp? ( net-libs/libesmtp ) |
| 103 |
@@ -58,8 +56,8 @@ src_configure() { |
| 104 |
--disable-dependency-tracking \ |
| 105 |
--disable-fatal-warnings \ |
| 106 |
$(use_with acl) \ |
| 107 |
- $(use_with cman cs-quorum) \ |
| 108 |
- $(use_with cman cman) \ |
| 109 |
+ --without-cs-quorum \ |
| 110 |
+ --without-cman \ |
| 111 |
$(use_with heartbeat) \ |
| 112 |
$(use_with smtp esmtp) \ |
| 113 |
$(use_with snmp) \ |
Archives