public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/
@ 2017-04-30  9:05 Jeroen Roovers
  0 siblings, 0 replies; 11+ messages in thread
From: Jeroen Roovers @ 2017-04-30  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     9bd613184a3de6c6943e9146ca28fe9fb00957cd
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 09:04:26 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 09:04:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd61318

sys-cluster/cluster-glue: Stable for HPPA (bug #616562).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
index 188c2e16164..475e9d6713a 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 hppa ~x86"
 IUSE="doc libnet static-libs"
 
 RDEPEND="app-text/asciidoc


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/
@ 2017-04-30  9:26 Agostino Sarubbo
  0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo @ 2017-04-30  9:26 UTC (permalink / raw
  To: gentoo-commits

commit:     ac894806c106082d1b29d12bd46626719ec59bab
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 09:25:42 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 09:25:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac894806

sys-cluster/cluster-glue: amd64 stable wrt bug #616562

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
index 475e9d6713a..527397e9ea9 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~x86"
+KEYWORDS="amd64 hppa ~x86"
 IUSE="doc libnet static-libs"
 
 RDEPEND="app-text/asciidoc


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/
@ 2017-05-04 15:55 Agostino Sarubbo
  0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo @ 2017-05-04 15:55 UTC (permalink / raw
  To: gentoo-commits

commit:     e95b008ba4c10ddfd8fc02d6098b49daa0d494b9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu May  4 15:54:54 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu May  4 15:54:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e95b008b

sys-cluster/cluster-glue: x86 stable wrt bug #616562

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
index 527397e9ea9..de7e47b7ac8 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~x86"
+KEYWORDS="amd64 hppa x86"
 IUSE="doc libnet static-libs"
 
 RDEPEND="app-text/asciidoc


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/
@ 2018-09-30 13:34 Jeroen Roovers
  0 siblings, 0 replies; 11+ messages in thread
From: Jeroen Roovers @ 2018-09-30 13:34 UTC (permalink / raw
  To: gentoo-commits

commit:     4450ee57aec67aed3f9c4ee37ed3457488b7a559
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 13:31:27 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 13:33:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4450ee57

sys-cluster/cluster-glue: Fix implicit openipmi dependency

* Depend on sys-libs/openipmi if USE=ipmilan
* Fix selector_t compile error with >openipmi-2.0.22
* Drop -fstack-protector-all while we're there

Fixes: https://bugs.gentoo.org/653248
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../cluster-glue/cluster-glue-1.0.12-r1.ebuild     | 96 ++++++++++++++++++++++
 sys-cluster/cluster-glue/metadata.xml              |  1 +
 2 files changed, 97 insertions(+)

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
new file mode 100644
index 00000000000..74f9306385a
--- /dev/null
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/cluster-}"
+inherit autotools eutils flag-o-matic multilib user
+
+DESCRIPTION="Library pack for Heartbeat / Pacemaker"
+HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
+SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc ipmilan libnet static-libs"
+
+RDEPEND="
+	!<sys-cluster/heartbeat-3.0
+	app-arch/bzip2
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.4
+	dev-libs/glib:2
+	dev-libs/libaio
+	dev-libs/libxml2
+	ipmilan? ( sys-libs/openipmi )
+	libnet? ( net-libs/libnet:1.1 )
+	net-misc/curl
+	net-misc/iputils
+	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		)"
+
+S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
+
+pkg_setup() {
+	enewgroup haclient
+	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
+}
+
+src_prepare() {
+	default
+	sed -e '/ -ggdb/d;/-fstack-protector-all/d' -i configure.ac || die
+	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
+		-i doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DOPENIPMI_DEFINE_SELECTOR_T
+	local myopts
+
+	use doc && myopts=" --enable-doc"
+	econf \
+		$(use_enable ipmilan) \
+		$(use_enable libnet) \
+		$(use_enable static-libs static) \
+		--disable-fatal-warnings \
+		--disable-dependency-tracking \
+		--docdir=/usr/share/doc/${PF} \
+		--localstatedir=/var \
+		--with-ocf-root=/usr/$(get_libdir)/ocf \
+		${myopts} \
+		--with-group-id=$(id -g hacluster) \
+		--with-ccmuser-id=$(id -u hacluster) \
+		--with-daemon-user=hacluster --with-daemon-group=haclient
+}
+
+src_install() {
+	default
+
+	dodir /var/lib/heartbeat/cores
+	dodir /var/lib/heartbeat/lrm
+
+	keepdir /var/lib/heartbeat/cores
+	keepdir /var/lib/heartbeat/lrm
+
+	# init.d file
+	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
+	sed -i \
+		-e "s:%libdir%:$(get_libdir):" \
+		"${T}/heartbeat-logd.init" || die
+# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die
+	rm "${D}"/etc/init.d/logd
+
+	use static-libs || find "${D}" -type f -name "*.la" -delete
+}
+
+pkg_postinst() {
+	chown -R hacluster:haclient /var/lib/heartbeat/cores
+	chown -R hacluster:haclient /var/lib/heartbeat/lrm
+}

diff --git a/sys-cluster/cluster-glue/metadata.xml b/sys-cluster/cluster-glue/metadata.xml
index c8788d4ba45..a3716ef230b 100644
--- a/sys-cluster/cluster-glue/metadata.xml
+++ b/sys-cluster/cluster-glue/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<longdescription>Cluster Glue is a set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack.</longdescription>
 	<use>
+		<flag name="ipmilan">Install the ipmilan plugin (requires <pkg>sys-libs/openipmi</pkg>)</flag>
 		<flag name="libnet">Force use of <pkg>net-libs/libnet</pkg></flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/
@ 2019-04-14 20:03 Alexys Jacob
  0 siblings, 0 replies; 11+ messages in thread
From: Alexys Jacob @ 2019-04-14 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     78edf0d33c34f11ca9f0bb414f36949c42a64fb2
Author:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 20:03:18 2019 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 20:03:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78edf0d3

sys-cluster/cluster-glue: add dev-libs/libltdl dep for binpkg fixes #669564

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>

 sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
index 74f9306385a..ad5e78db793 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ RDEPEND="
 	app-text/docbook-xml-dtd:4.4
 	dev-libs/glib:2
 	dev-libs/libaio
+	dev-libs/libltdl:=
 	dev-libs/libxml2
 	ipmilan? ( sys-libs/openipmi )
 	libnet? ( net-libs/libnet:1.1 )


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/
@ 2020-10-21 12:59 Alexys Jacob
  0 siblings, 0 replies; 11+ messages in thread
From: Alexys Jacob @ 2020-10-21 12:59 UTC (permalink / raw
  To: gentoo-commits

commit:     b5442dd701a9eaaf22fb92808fb0ec93f7a9f1e6
Author:     Timo Rothenpieler <btbn <AT> btbn <DOT> de>
AuthorDate: Fri Jul 24 19:18:13 2020 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 12:58:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5442dd7

sys-cluster/cluster-glue: fix build

Signed-off-by: Timo Rothenpieler <btbn <AT> btbn.de>
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>

 sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
index ad8181b8ecb..e75f1ce7252 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P="${P/cluster-}"
 inherit autotools eutils flag-o-matic multilib user
@@ -16,7 +16,6 @@ KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc ipmilan libnet static-libs"
 
 RDEPEND="
-	!<sys-cluster/heartbeat-3.0
 	app-arch/bzip2
 	app-text/asciidoc
 	app-text/docbook-xml-dtd:4.4
@@ -40,12 +39,12 @@ S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
 
 pkg_setup() {
 	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
+	enewuser  hacluster -1 -1 /var/lib/heartbeat haclient
 }
 
 src_prepare() {
 	default
-	sed -e '/ -ggdb/d;/-fstack-protector-all/d' -i configure.ac || die
+	sed -e 's/\\$(/$(/g' -e '/ -ggdb/d;/-fstack-protector-all/d' -i configure.ac || die
 	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
 		-i doc/Makefile.am || die
 	eautoreconf
@@ -72,10 +71,7 @@ src_configure() {
 src_install() {
 	default
 
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
+	keepdir /var/lib/heartbeat/cores/{hacluster,nobody,root}
 	keepdir /var/lib/heartbeat/lrm
 
 	# init.d file


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/
@ 2020-11-14 19:17 Sergei Trofimovich
  0 siblings, 0 replies; 11+ messages in thread
From: Sergei Trofimovich @ 2020-11-14 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     af0a0352f356cd8424fde9efe32a611b4f578a72
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 19:13:00 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 19:16:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af0a0352

sys-cluster/cluster-glue: stable 1.0.12-r1 for hppa

stable wrt bug #704610

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
index 19db3e948cf..0fe711b89dc 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa x86"
+KEYWORDS="~amd64 hppa x86"
 IUSE="doc ipmilan libnet static-libs"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/
@ 2020-11-14 23:39 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2020-11-14 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     cf0721829e53dc8b2cb3c5379c69199522f4ffcc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 23:38:01 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 23:38:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf072182

sys-cluster/cluster-glue: Stabilize 1.0.12-r1 amd64, #704610

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
index 0fe711b89dc..9819d391ebb 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa x86"
+KEYWORDS="amd64 hppa x86"
 IUSE="doc ipmilan libnet static-libs"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/
@ 2021-02-17  9:37 David Seifert
  0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2021-02-17  9:37 UTC (permalink / raw
  To: gentoo-commits

commit:     990e20f823e9ad4f78191d383ef15eaf8c82c057
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Feb 17 09:36:31 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 09:36:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=990e20f8

sys-cluster/cluster-glue: Remove sys-cluster/heartbeat reference

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild | 5 ++---
 sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
index e7ce0226b21..bdf6cdef9dd 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,8 +23,7 @@ RDEPEND="app-arch/bzip2
 	net-misc/curl
 	net-misc/iputils
 	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2
-	!<sys-cluster/heartbeat-3.0"
+	dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	doc? (
 		dev-libs/libxslt

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
index 0ca1f105968..4e18625e1db 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,8 +24,7 @@ RDEPEND="app-text/asciidoc
 	net-misc/curl
 	net-misc/iputils
 	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2
-	!<sys-cluster/heartbeat-3.0"
+	dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	doc? (
 		dev-libs/libxslt


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/
@ 2021-07-18 16:18 Conrad Kostecki
  0 siblings, 0 replies; 11+ messages in thread
From: Conrad Kostecki @ 2021-07-18 16:18 UTC (permalink / raw
  To: gentoo-commits

commit:     253eb25a168b8122ad5706838c485475dc2a54f2
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 11:31:37 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 16:17:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253eb25a

sys-cluster/cluster-glue: drop old version

Closes: https://bugs.gentoo.org/781497
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-cluster/cluster-glue/Manifest                  |  1 -
 .../cluster-glue/cluster-glue-1.0.11.ebuild        | 87 ---------------------
 .../cluster-glue/cluster-glue-1.0.12-r1.ebuild     | 91 ----------------------
 .../cluster-glue/cluster-glue-1.0.12.ebuild        | 88 ---------------------
 4 files changed, 267 deletions(-)

diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 7a92b40c710..4c54ee97e9c 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -1,2 +1 @@
-DIST glue-1.0.11.tar.bz2 466057 BLAKE2B 929c9f803814fb1162d4058e0fb78deb96b6be9b4064dae96ea5653521f5dfb862850ab2c9010530ac652264c5e8e379cb397fc173f720d126540405b264ca5b SHA512 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
 DIST glue-1.0.12.tar.bz2 451569 BLAKE2B c074507563e797f105318bfcfab3e73eb1b62eb3037689c2b68f1b98f02b4a2c1da2e0b2931cd28ccc194d9f3b486733f642c6ff071c4f7629062d40c8d39427 SHA512 d5d2f6c426d2bed0d39269338fedfffe840a90ff56b05dff395243d0d8b803593bf35bbce5f7dce376120cd7ddef78400914cb7515b5451c287a1e9e74233122

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
deleted file mode 100644
index b61d99db6fb..00000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/cluster-}"
-inherit autotools multilib user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc libnet static-libs"
-
-RDEPEND="app-arch/bzip2
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/glib:2
-	dev-libs/libaio
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	default
-	sed -e '/ -ggdb3/d' -i configure.ac || die
-	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
-		-i doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	default
-
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
deleted file mode 100644
index e37323b4c22..00000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/cluster-}"
-inherit autotools flag-o-matic multilib user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc ipmilan libnet static-libs"
-
-RDEPEND="
-	app-arch/bzip2
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/glib:2
-	dev-libs/libaio
-	dev-libs/libltdl:=
-	dev-libs/libxml2
-	ipmilan? ( sys-libs/openipmi )
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 -1 /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	default
-	sed -e 's/\\$(/$(/g' -e '/ -ggdb/d;/-fstack-protector-all/d' -i configure.ac || die
-	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
-		-i doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DOPENIPMI_DEFINE_SELECTOR_T
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable ipmilan) \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/heartbeat/cores/{hacluster,nobody,root}
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
deleted file mode 100644
index ea054ce7039..00000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/cluster-}"
-inherit autotools multilib user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc libnet static-libs"
-
-RDEPEND="app-text/asciidoc
-	app-arch/bzip2
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/glib:2
-	dev-libs/libaio
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	default
-	sed -e '/ -ggdb/d' -i configure.ac || die
-	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
-		-i doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	default
-
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/
@ 2021-07-18 16:18 Conrad Kostecki
  0 siblings, 0 replies; 11+ messages in thread
From: Conrad Kostecki @ 2021-07-18 16:18 UTC (permalink / raw
  To: gentoo-commits

commit:     e87eeb1c53ae3e1343842543820e45f8abcce957
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 11:30:34 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 16:17:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e87eeb1c

sys-cluster/cluster-glue: migrate to glep 81

Bug: https://bugs.gentoo.org/781497
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../cluster-glue/cluster-glue-1.0.12-r2.ebuild     | 91 ++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r2.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r2.ebuild
new file mode 100644
index 00000000000..c3100b232fb
--- /dev/null
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/cluster-}"
+
+inherit autotools flag-o-matic multilib
+
+DESCRIPTION="Library pack for Heartbeat / Pacemaker"
+HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
+SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
+S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE="doc ipmilan libnet static-libs"
+
+RDEPEND="
+	acct-group/haclient
+	acct-user/hacluster
+	app-arch/bzip2
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.4
+	dev-libs/glib:2
+	dev-libs/libaio
+	dev-libs/libltdl:=
+	dev-libs/libxml2
+	ipmilan? ( sys-libs/openipmi )
+	libnet? ( net-libs/libnet:1.1 )
+	net-misc/curl
+	net-misc/iputils
+	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
+"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+"
+
+src_prepare() {
+	default
+	sed -e 's/\\$(/$(/g' -e '/ -ggdb/d;/-fstack-protector-all/d' -i configure.ac || die
+	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
+		-i doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DOPENIPMI_DEFINE_SELECTOR_T
+
+	local myeconfargs=(
+		$(use_enable ipmilan)
+		$(use_enable libnet)
+		$(use_enable static-libs static)
+		$(usex doc '--enable-doc' '')
+		--disable-fatal-warnings
+		--localstatedir=/var
+		--with-ocf-root=/usr/$(get_libdir)/ocf
+		--with-group-id=$(id -g hacluster)
+		--with-ccmuser-id=$(id -u hacluster)
+		--with-daemon-user=hacluster --with-daemon-group=haclient
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/heartbeat/cores/{hacluster,nobody,root}
+	keepdir /var/lib/heartbeat/lrm
+
+	# init.d file
+	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
+	sed -i \
+		-e "s:%libdir%:$(get_libdir):" \
+		"${T}/heartbeat-logd.init" || die
+	# newinitd "${T}/heartbeat-logd.init" heartbeat-logd
+	rm "${D}"/etc/init.d/logd
+
+	use static-libs || find "${D}" -type f -name "*.la" -delete
+}
+
+pkg_postinst() {
+	chown -R hacluster:haclient /var/lib/heartbeat/cores
+	chown -R hacluster:haclient /var/lib/heartbeat/lrm
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2021-07-18 16:18 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-17  9:37 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cluster-glue/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2021-07-18 16:18 Conrad Kostecki
2021-07-18 16:18 Conrad Kostecki
2020-11-14 23:39 Sam James
2020-11-14 19:17 Sergei Trofimovich
2020-10-21 12:59 Alexys Jacob
2019-04-14 20:03 Alexys Jacob
2018-09-30 13:34 Jeroen Roovers
2017-05-04 15:55 Agostino Sarubbo
2017-04-30  9:26 Agostino Sarubbo
2017-04-30  9:05 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox