[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/ - gentoo-commits

From:	"Michał Górny" <mgorny@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sys-cluster/pacemaker/
Date:	Fri, 09 Oct 2020 08:21:01
Message-Id:	`1602231654.234096c2d922648ed9345903a010d9c977937525.mgorny@gentoo`

1

commit:     234096c2d922648ed9345903a010d9c977937525

2

Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>

3

AuthorDate: Fri Oct  9 08:20:08 2020 +0000

4

Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>

5

CommitDate: Fri Oct  9 08:20:54 2020 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234096c2

7

8

sys-cluster/pacemaker: Remove dep on heartbeat

9

10

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

11

12

 sys-cluster/pacemaker/metadata.xml               |  1 -

13

 sys-cluster/pacemaker/pacemaker-1.1.16.ebuild    | 15 ++++-----------

14

 sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild | 14 ++++----------

15

 sys-cluster/pacemaker/pacemaker-1.1.19.ebuild    | 15 ++++-----------

16

 4 files changed, 12 insertions(+), 33 deletions(-)

17

18

diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml

19

index 4548b53178e..dcb0f854efe 100644

20

--- a/sys-cluster/pacemaker/metadata.xml

21

+++ b/sys-cluster/pacemaker/metadata.xml

22

@@ -12,7 +12,6 @@

23

 		capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).

24

 	</longdescription>

25

 	<use>

26

-		<flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>

27

 		<flag name="smtp">Enable SMTP support via <pkg>net-libs/libesmtp</pkg></flag>

28

 	</use>

29

 	<upstream>

30

31

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild

32

index f6bef07a121..ef21da20c78 100644

33

--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild

34

+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild

35

@@ -16,16 +16,15 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"

36

 LICENSE="GPL-2"

37

 SLOT="0"

38

 KEYWORDS="amd64 ~hppa x86"

39

-IUSE="acl heartbeat smtp snmp static-libs"

40

+IUSE="acl smtp snmp static-libs"

41

42

 DEPEND="${PYTHON_DEPS}

43

 	app-text/docbook-xsl-stylesheets

44

 	dev-libs/libxslt

45

 	sys-cluster/cluster-glue

46

+	sys-cluster/corosync

47

 	>=sys-cluster/libqb-0.14.0

48

 	sys-cluster/resource-agents

49

-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )

50

-	!heartbeat? ( sys-cluster/corosync )

51

 	smtp? ( net-libs/libesmtp )

52

 	snmp? ( net-analyzer/net-snmp )

53

"

54

@@ -43,12 +42,6 @@ src_prepare() {

55

}

56

57

 src_configure() {

58

-	local myopts=""

59

-	if use heartbeat ; then

60

-		myopts="--without-corosync"

61

-	else

62

-		myopts="--with-ais"

63

-	fi

64

 	# appends lib to localstatedir automatically

65

 	econf \

66

 		--localstatedir=/var \

67

@@ -56,11 +49,11 @@ src_configure() {

68

 		$(use_with acl) \

69

 		--without-cs-quorum \

70

 		--without-cman \

71

-		$(use_with heartbeat) \

72

+		--without-heartbeat \

73

 		$(use_with smtp esmtp) \

74

 		$(use_with snmp) \

75

 		$(use_enable static-libs static) \

76

-		${myopts}

77

+		--with-ais

78

}

79

80

 src_install() {

81

82

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild

83

index c20405e8e1b..7790d983ce7 100644

84

--- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild

85

+++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild

86

@@ -16,17 +16,16 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"

87

 LICENSE="GPL-2"

88

 SLOT="0"

89

 KEYWORDS="~amd64 ~hppa ~x86"

90

-IUSE="acl heartbeat smtp snmp"

91

+IUSE="acl smtp snmp"

92

93

 DEPEND="${PYTHON_DEPS}

94

 	app-text/docbook-xsl-stylesheets

95

 	dev-libs/libxslt

96

 	sys-cluster/cluster-glue

97

+	sys-cluster/corosync

98

 	>=sys-cluster/libqb-0.14.0

99

 	sys-cluster/resource-agents

100

101

-	heartbeat?	( >=sys-cluster/heartbeat-3.0.0 )

102

-	!heartbeat?	( sys-cluster/corosync )

103

 	smtp?		( net-libs/libesmtp )

104

 	snmp?		( net-analyzer/net-snmp )

105

"

106

@@ -52,17 +51,12 @@ src_configure() {

107

 		--without-cs-quorum

108

 		--without-cman

109

 		$(use_with acl)

110

-		$(use_with heartbeat)

111

+		--without-heartbeat

112

 		$(use_with smtp esmtp)

113

 		$(use_with snmp)

114

+		--with-ais

115

)

116

117

-	if use heartbeat ; then

118

-		myconf+=( --without-corosync )

119

-	else

120

-		myconf+=( --with-ais )

121

-	fi

122

-

123

 	econf "${myconf[@]}"

124

}

125

126

127

diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild

128

index 0c8299ce037..d1e44f3de6f 100644

129

--- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild

130

+++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild

131

@@ -16,16 +16,15 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"

132

 LICENSE="GPL-2"

133

 SLOT="0"

134

 KEYWORDS="~amd64 ~hppa ~x86"

135

-IUSE="acl heartbeat smtp snmp static-libs"

136

+IUSE="acl smtp snmp static-libs"

137

138

 DEPEND="${PYTHON_DEPS}

139

 	app-text/docbook-xsl-stylesheets

140

 	dev-libs/libxslt

141

 	sys-cluster/cluster-glue

142

+	sys-cluster/corosync

143

 	>=sys-cluster/libqb-0.14.0

144

 	sys-cluster/resource-agents

145

-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )

146

-	!heartbeat? ( sys-cluster/corosync )

147

 	smtp? ( net-libs/libesmtp )

148

 	snmp? ( net-analyzer/net-snmp )

149

"

150

@@ -43,12 +42,6 @@ src_prepare() {

151

}

152

153

 src_configure() {

154

-	local myopts=""

155

-	if use heartbeat ; then

156

-		myopts="--without-corosync"

157

-	else

158

-		myopts="--with-ais"

159

-	fi

160

 	# appends lib to localstatedir automatically

161

 	econf \

162

 		--localstatedir=/var \

163

@@ -56,11 +49,11 @@ src_configure() {

164

 		$(use_with acl) \

165

 		--without-cs-quorum \

166

 		--without-cman \

167

-		$(use_with heartbeat) \

168

+		--without-heartbeat \

169

 		$(use_with smtp esmtp) \

170

 		$(use_with snmp) \

171

 		$(use_enable static-libs static) \

172

-		${myopts}

173

+		--with-ais

174

}

175

176

 src_install() {

1	commit: 234096c2d922648ed9345903a010d9c977937525
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Fri Oct 9 08:20:08 2020 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Fri Oct 9 08:20:54 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234096c2
7
8	sys-cluster/pacemaker: Remove dep on heartbeat
9
10	Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12	sys-cluster/pacemaker/metadata.xml \| 1 -
13	sys-cluster/pacemaker/pacemaker-1.1.16.ebuild \| 15 ++++-----------
14	sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild \| 14 ++++----------
15	sys-cluster/pacemaker/pacemaker-1.1.19.ebuild \| 15 ++++-----------
16	4 files changed, 12 insertions(+), 33 deletions(-)
17
18	diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
19	index 4548b53178e..dcb0f854efe 100644
20	--- a/sys-cluster/pacemaker/metadata.xml
21	+++ b/sys-cluster/pacemaker/metadata.xml
22	@@ -12,7 +12,6 @@
23	capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
24	</longdescription>
25	<use>
26	- <flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
27	<flag name="smtp">Enable SMTP support via <pkg>net-libs/libesmtp</pkg></flag>
28	</use>
29	<upstream>
30
31	diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
32	index f6bef07a121..ef21da20c78 100644
33	--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
34	+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
35	@@ -16,16 +16,15 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
36	LICENSE="GPL-2"
37	SLOT="0"
38	KEYWORDS="amd64 ~hppa x86"
39	-IUSE="acl heartbeat smtp snmp static-libs"
40	+IUSE="acl smtp snmp static-libs"
41
42	DEPEND="${PYTHON_DEPS}
43	app-text/docbook-xsl-stylesheets
44	dev-libs/libxslt
45	sys-cluster/cluster-glue
46	+ sys-cluster/corosync
47	>=sys-cluster/libqb-0.14.0
48	sys-cluster/resource-agents
49	- heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
50	- !heartbeat? ( sys-cluster/corosync )
51	smtp? ( net-libs/libesmtp )
52	snmp? ( net-analyzer/net-snmp )
53	"
54	@@ -43,12 +42,6 @@ src_prepare() {
55	}
56
57	src_configure() {
58	- local myopts=""
59	- if use heartbeat ; then
60	- myopts="--without-corosync"
61	- else
62	- myopts="--with-ais"
63	- fi
64	# appends lib to localstatedir automatically
65	econf \
66	--localstatedir=/var \
67	@@ -56,11 +49,11 @@ src_configure() {
68	$(use_with acl) \
69	--without-cs-quorum \
70	--without-cman \
71	- $(use_with heartbeat) \
72	+ --without-heartbeat \
73	$(use_with smtp esmtp) \
74	$(use_with snmp) \
75	$(use_enable static-libs static) \
76	- ${myopts}
77	+ --with-ais
78	}
79
80	src_install() {
81
82	diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
83	index c20405e8e1b..7790d983ce7 100644
84	--- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
85	+++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
86	@@ -16,17 +16,16 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
87	LICENSE="GPL-2"
88	SLOT="0"
89	KEYWORDS="~amd64 ~hppa ~x86"
90	-IUSE="acl heartbeat smtp snmp"
91	+IUSE="acl smtp snmp"
92
93	DEPEND="${PYTHON_DEPS}
94	app-text/docbook-xsl-stylesheets
95	dev-libs/libxslt
96	sys-cluster/cluster-glue
97	+ sys-cluster/corosync
98	>=sys-cluster/libqb-0.14.0
99	sys-cluster/resource-agents
100
101	- heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
102	- !heartbeat? ( sys-cluster/corosync )
103	smtp? ( net-libs/libesmtp )
104	snmp? ( net-analyzer/net-snmp )
105	"
106	@@ -52,17 +51,12 @@ src_configure() {
107	--without-cs-quorum
108	--without-cman
109	$(use_with acl)
110	- $(use_with heartbeat)
111	+ --without-heartbeat
112	$(use_with smtp esmtp)
113	$(use_with snmp)
114	+ --with-ais
115	)
116
117	- if use heartbeat ; then
118	- myconf+=( --without-corosync )
119	- else
120	- myconf+=( --with-ais )
121	- fi
122	-
123	econf "${myconf[@]}"
124	}
125
126
127	diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
128	index 0c8299ce037..d1e44f3de6f 100644
129	--- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
130	+++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
131	@@ -16,16 +16,15 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
132	LICENSE="GPL-2"
133	SLOT="0"
134	KEYWORDS="~amd64 ~hppa ~x86"
135	-IUSE="acl heartbeat smtp snmp static-libs"
136	+IUSE="acl smtp snmp static-libs"
137
138	DEPEND="${PYTHON_DEPS}
139	app-text/docbook-xsl-stylesheets
140	dev-libs/libxslt
141	sys-cluster/cluster-glue
142	+ sys-cluster/corosync
143	>=sys-cluster/libqb-0.14.0
144	sys-cluster/resource-agents
145	- heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
146	- !heartbeat? ( sys-cluster/corosync )
147	smtp? ( net-libs/libesmtp )
148	snmp? ( net-analyzer/net-snmp )
149	"
150	@@ -43,12 +42,6 @@ src_prepare() {
151	}
152
153	src_configure() {
154	- local myopts=""
155	- if use heartbeat ; then
156	- myopts="--without-corosync"
157	- else
158	- myopts="--with-ais"
159	- fi
160	# appends lib to localstatedir automatically
161	econf \
162	--localstatedir=/var \
163	@@ -56,11 +49,11 @@ src_configure() {
164	$(use_with acl) \
165	--without-cs-quorum \
166	--without-cman \
167	- $(use_with heartbeat) \
168	+ --without-heartbeat \
169	$(use_with smtp esmtp) \
170	$(use_with snmp) \
171	$(use_enable static-libs static) \
172	- ${myopts}
173	+ --with-ais
174	}
175
176	src_install() {

Gentoo Archives: gentoo-commits