gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

sys-cluster/pacemaker: [QA] Punt removed cman dep

Browse Source 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2018-12-11 16:04:43 +01:00
parent dedcd185fe
commit e473547029
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
profiles/base/package.use.mask
View File

@@ -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 <pacho@gento.org> (04 Nov 2018)
# cman and co. are going to be removed (#650738)
sys-cluster/pacemaker cman
# Pacho Ramos <pacho@gento.org> (01 Nov 2018)
# cman and co. are going to be removed (#650738)
sys-fs/lvm2 cman clvm

1
sys-cluster/pacemaker/metadata.xml
View File

@@ -12,7 +12,6 @@
capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
</longdescription>
<use>
<flag name="cman">Enable cman support.</flag>
<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>

8
sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
View File

@@ -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) \

8
sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
View File

@@ -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) \