summaryrefslogtreecommitdiff
path: root/sys-cluster/pacemaker
diff options
context:
space:
mode:
Diffstat (limited to 'sys-cluster/pacemaker')
-rw-r--r--sys-cluster/pacemaker/Manifest6
-rw-r--r--sys-cluster/pacemaker/metadata.xml1
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.16.ebuild8
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.19.ebuild8
4 files changed, 9 insertions, 14 deletions
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index bf7371321e49..e9d87b9558d7 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -2,6 +2,6 @@ AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db
AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e4128ed7335d9d1d11b5fbaf657e9ccabd6a7d4b1a120a00d7e46678f8a7a635b0dee7a2aa60559e78d50c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b
DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2 SHA512 c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
-EBUILD pacemaker-1.1.16.ebuild 1800 BLAKE2B ecde13f0404966b2839eb47848a37760cfaad76878f6859967484c4e42e49527f7f1861538004aa2d7b651247671996cd0b61732421cc881434bf3d4a4550cab SHA512 549a2dc99b5d0df356c55bbd873cf96f3643e7b64984b3fa4687f0cafd5345cd57ce69ae5932a78687bbfa9b4bb861e032d311c0a5461397752dc78eb21e71bb
-EBUILD pacemaker-1.1.19.ebuild 1803 BLAKE2B 086752040b1730505957b802ae77efaa7c36eea0609255a7f6e3ff85e398863b8f2c0a0933a065853012289957c7168580e35e7d3808ce3ae5fceccb81c701a7 SHA512 7a0dcdf0c7cf699fe47d1748cf70f58f74e3b2073a13f574ac96231c6d8cdd464d96d7299ff6986639edd9317cab9e848faead72cb3e611cc18d114ed7eec493
-MISC metadata.xml 960 BLAKE2B a5d656c25a4a0663c4c9e9d01d69e5a84232d724f54ee895aa38a8d53e61f460b890df34d787536770ee64130799dc447dfb8dd2b32b984c933c71b38396c08a SHA512 1bec04a003d61dfcaffad2fa9ca2bcbf5504f35103c544749a9af251a32fe52c0b92cf4e0099eeffef63535b55d4393616093c13e7bee7e02170f57eca98e563
+EBUILD pacemaker-1.1.16.ebuild 1717 BLAKE2B bd304b1002434499f249ae7e1086137f2feff3d733924513f0d7ed1af3b6293ac4515844ff3360ecf319f2de77eb7fd3cace492e9641649f9ad1c8bbfe1da621 SHA512 2cde996f9d0eb1dec1f534adf05d3390ac2c78bb891898ebe5bcc6f27ec9d1eff571880441a25aa260c8fcfc4c61af8260ab47499e47f88dd377c252854d29ee
+EBUILD pacemaker-1.1.19.ebuild 1720 BLAKE2B 13e9d97d068ddfb22e41219d1a86471084132dcbaa78637a5d9f40a7ad291861b5f9ce9bfbb5ab26172e7b07726f2a92be97ace5cba26dc543ec7c9b7921752f SHA512 67d65c32128d13bc9403c55d736b7f4bceba9cfff49d6889798c6d86d69cea6812899119e391f33967f9adaf302182f33ba133ec1d0d10aa1d2c2eab16b4166e
+MISC metadata.xml 889 BLAKE2B 9b52f88582de605852765e0956640e713e68584066410f472beecccbf69db5a8b7226aaf4ce12851b45fd6945d0cde5cd7e524a873599bf35d4e3cf03a6dd8a5 SHA512 dbfaa3e72fbe361e1648a0a1dfd3e0f153489d005f052fc4ddd1468480d53c84a49bb18c0cfc16ac3f2f409f2ff673ec554faae562452420b898167b8650654f
diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index 0d3bda39fd28..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).
</longdescription>
<use>
- <flag name="cman">Enable <pkg>sys-cluster/cman</pkg> 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>
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) \